Changeset 28587 for trunk/include/functions_plugins.inc.php

Timestamp:

Jun 2, 2014, 9:55:46 AM (10 years ago)

Author:

mistic100

Message:

feature 3010 : replace trigger_action/event by trigger_notify/change

File:

• trunk/include/functions_plugins.inc.php (modified) (6 diffs)

trunk/include/functions_plugins.inc.php

@@ -247 +247 @@
  *
  * @since 2.6
- * @todo remove trigger_event()
  *
  * @param string $event
@@ -256 +255 @@
 function trigger_change($event, $data=null)
 {
-  $args = func_get_args();
-  return call_user_func_array('trigger_event', $args);
-}
-
-/**
- * @deprecated 2.6
- * @see trigger_change
- */
-function trigger_event($event, $data=null)
-{
   global $pwg_event_handlers;
 
   if (isset($pwg_event_handlers['trigger']))
   {// debugging
-    trigger_action('trigger',
+    trigger_notify('trigger',
       array('type'=>'event', 'event'=>$event, 'data'=>$data)
       );
@@ -299 +288 @@
   if (isset($pwg_event_handlers['trigger']))
   {// debugging
-    trigger_action('trigger',
+    trigger_notify('trigger',
       array('type'=>'post_event', 'event'=>$event, 'data'=>$data)
       );
@@ -312 +301 @@
  *
  * @since 2.6
- * @todo remove trigger_action()
  *
  * @param string $event
@@ -319 +307 @@
 function trigger_notify($event)
 {
-  $args = func_get_args();
-  return call_user_func_array('trigger_action', $args);
-}
-
-/**
- * @deprecated 2.6
- * @see trigger_notify
- */
-function trigger_action($event)
-{
   global $pwg_event_handlers;
 
   if (isset($pwg_event_handlers['trigger']) and $event!='trigger')
   {// debugging - avoid recursive calls
-    trigger_action('trigger',
+    trigger_notify('trigger',
       array('type'=>'action', 'event'=>$event, 'data'=>null)
       );
@@ -456 +434 @@
       load_plugin($plugin);
     }
-    trigger_action('plugins_loaded');
+    trigger_notify('plugins_loaded');
   }
 }