Changeset 3137 for branches/2.0/plugins

Timestamp:

Feb 13, 2009, 2:02:20 PM (15 years ago)

Author:

rvelices

Message:

merge r3136 from trunk

• moved check upgrade feed code to admin/include/functions_upgrade.php
• refactored some code (shorter and somehow faster - but nothing revolutionary)
• decrease lost space in permalinks.tpl and hard coded column width (was illisible)

File:

• branches/2.0/plugins/event_tracer/main.inc.php (modified) (4 diffs)

branches/2.0/plugins/event_tracer/main.inc.php

@@ -81 +81 @@
   }
 
-  function on_pre_trigger_event($event_info)
-  {
-    @$this->trigger_counts[$event_info['event']]++;
-    $this->dump('pre_trigger_event', $event_info);
-  }
-  function on_post_trigger_event($event_info)
-  {
-    $this->dump('post_trigger_event', $event_info);
-  }
-
-  function on_trigger_action($event_info)
-  {
-   @$this->trigger_counts[$event_info['event']]++;
-    $this->dump('trigger_action', $event_info);
-  }
-
   function on_page_tail()
   {
@@ -130 +114 @@
   }
 
-  function dump($event, $event_info)
+  function on_trigger($event_info)
   {
+    if ($event_info['type']!='post_event')
+      @$this->trigger_counts[$event_info['event']]++;
+
     foreach( $this->my_config['filters'] as $filter)
     {
@@ -144 +131 @@
         else
           $s = '';
-        pwg_debug($event.' "'.$event_info['event'].'" '.($this->trigger_counts[$event_info['event']]).' calls '.($s) );
+        pwg_debug($event_info['type'].' "'.$event_info['event'].'" '.($this->trigger_counts[$event_info['event']]).' calls '.($s) );
         break;
       }
@@ -166 +153 @@
 
 add_event_handler('get_admin_plugin_menu_links', array(&$obj, 'plugin_admin_menu') );
-add_event_handler('pre_trigger_event', array(&$obj, 'on_pre_trigger_event') );
-add_event_handler('post_trigger_event', array(&$obj, 'on_post_trigger_event') );
 add_event_handler('loc_begin_page_tail', array(&$obj, 'on_page_tail') );
-add_event_handler('trigger_action', array(&$obj, 'on_trigger_action') );
+add_event_handler('trigger', array(&$obj, 'on_trigger') );
 set_plugin_data($plugin['id'], $obj);
 ?>