From 4bd32005b56f6ec741ceeed0a1745fe89f291085 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Mon, 2 Jun 2014 07:55:46 +0000 Subject: feature 3010 : replace trigger_action/event by trigger_notify/change git-svn-id: http://piwigo.org/svn/trunk@28587 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/check_integrity.class.php | 2 +- admin/include/functions.php | 18 +++++++++--------- admin/include/functions_history.inc.php | 2 +- admin/include/image.class.php | 2 +- admin/include/tabsheet.class.php | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'admin/include') diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php index da549d777..66ff1db8f 100644 --- a/admin/include/check_integrity.class.php +++ b/admin/include/check_integrity.class.php @@ -66,7 +66,7 @@ class check_integrity $this->retrieve_list = array(); $this->build_ignore_list = array(); - trigger_action('list_check_integrity', $this); + trigger_notify('list_check_integrity', $this); // Information if (count($this->retrieve_list) > 0) diff --git a/admin/include/functions.php b/admin/include/functions.php index da4e93b60..970671315 100644 --- a/admin/include/functions.php +++ b/admin/include/functions.php @@ -162,7 +162,7 @@ DELETE FROM '.USER_CACHE_CATEGORIES_TABLE.' WHERE cat_id IN ('.implode(',',$ids).')'; pwg_query($query); - trigger_action('delete_categories', $ids); + trigger_notify('delete_categories', $ids); } /** @@ -250,7 +250,7 @@ function delete_elements($ids, $physical_deletion=false) { return 0; } - trigger_action('begin_delete_elements', $ids); + trigger_notify('begin_delete_elements', $ids); if ($physical_deletion) { @@ -325,7 +325,7 @@ SELECT update_category($category_ids); } - trigger_action('delete_elements', $ids); + trigger_notify('delete_elements', $ids); return count($ids); } @@ -383,7 +383,7 @@ DELETE FROM '.USERS_TABLE.' ;'; pwg_query($query); - trigger_action('delete_user', $user_id); + trigger_notify('delete_user', $user_id); } /** @@ -1573,7 +1573,7 @@ SELECT id ;'; if (count($existing_tags = array_from_query($query, 'id')) == 0) { - $url_name = trigger_event('render_tag_url', $tag_name); + $url_name = trigger_change('render_tag_url', $tag_name); // search existing by url name $query = ' SELECT id @@ -1841,7 +1841,7 @@ UPDATE '.USER_CACHE_TABLE.' SET need_update = \'true\';'; pwg_query($query); } - trigger_action('invalidate_user_cache', $full); + trigger_notify('invalidate_user_cache', $full); } /** @@ -1976,7 +1976,7 @@ SELECT id TAGS_TABLE, array( 'name' => $tag_name, - 'url_name' => trigger_event('render_tag_url', $tag_name), + 'url_name' => trigger_change('render_tag_url', $tag_name), ) ); @@ -2326,7 +2326,7 @@ function get_taglist($query, $only_user_language=true) while ($row = pwg_db_fetch_assoc($result)) { $raw_name = $row['name']; - $name = trigger_event('render_tag_name', $raw_name, $row); + $name = trigger_change('render_tag_name', $raw_name, $row); $taglist[] = array( 'name' => $name, @@ -2335,7 +2335,7 @@ function get_taglist($query, $only_user_language=true) if (!$only_user_language) { - $alt_names = trigger_event('get_tag_alt_names', array(), $raw_name); + $alt_names = trigger_change('get_tag_alt_names', array(), $raw_name); foreach( array_diff( array_unique($alt_names), array($name) ) as $alt) { diff --git a/admin/include/functions_history.inc.php b/admin/include/functions_history.inc.php index 938061e96..6c6bddef7 100644 --- a/admin/include/functions_history.inc.php +++ b/admin/include/functions_history.inc.php @@ -177,6 +177,6 @@ SELECT } add_event_handler('get_history', 'get_history', EVENT_HANDLER_PRIORITY_NEUTRAL, 3); -trigger_action('functions_history_included'); +trigger_notify('functions_history_included'); ?> \ No newline at end of file diff --git a/admin/include/image.class.php b/admin/include/image.class.php index fd231f337..22949fcbe 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -64,7 +64,7 @@ class pwg_image { $this->source_filepath = $source_filepath; - trigger_action('load_image_library', array(&$this) ); + trigger_notify('load_image_library', array(&$this) ); if (is_object($this->image)) { diff --git a/admin/include/tabsheet.class.php b/admin/include/tabsheet.class.php index 9dc441a7e..c7681b611 100644 --- a/admin/include/tabsheet.class.php +++ b/admin/include/tabsheet.class.php @@ -88,7 +88,7 @@ class tabsheet */ function select($name) { - $this->sheets = trigger_event('tabsheet_before_select', $this->sheets, $this->uniqid); + $this->sheets = trigger_change('tabsheet_before_select', $this->sheets, $this->uniqid); if (!array_key_exists($name, $this->sheets)) { $keys = array_keys($this->sheets); -- cgit v1.2.3