mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-27 11:49:56 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

feature 3010 : replace trigger_action/event by trigger_notify/change

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@28587 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2014-06-02 07:55:46 +00:00
parent f98edc7a2e
commit 4bd32005b5
62 changed files with 322 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

30
include/functions_plugins.inc.php
View file

@ -246,7 +246,6 @@ function remove_event_handler($event, $func,
* optional _$args_ are not transmitted.
*
* @since 2.6
* @todo remove trigger_event()
*
* @param string $event
* @param mixed $data data to transmit to all handlers
@ -254,22 +253,12 @@ function remove_event_handler($event, $func,
* @return mixed $data
*/
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)
);
}
@ -298,7 +287,7 @@ function trigger_event($event, $data=null)
if (isset($pwg_event_handlers['trigger']))
{// debugging
trigger_action('trigger',
trigger_notify('trigger',
array('type'=>'post_event', 'event'=>$event, 'data'=>$data)
);
}
@ -311,28 +300,17 @@ function trigger_event($event, $data=null)
* trigger_notify() is only used as a notifier, no modification of data is possible
*
* @since 2.6
* @todo remove trigger_action()
*
* @param string $event
* @param mixed $args,... optional arguments
*/
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)
);
}
@ -455,7 +433,7 @@ function load_plugins()
{// include main from a function to avoid using same function context
load_plugin($plugin);
}
trigger_action('plugins_loaded');
trigger_notify('plugins_loaded');
}
}