From c8f6c3c934df01bf969e3d91ae67f0887de10da9 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Wed, 10 Nov 2010 22:22:40 +0000 Subject: Fixes #2367: With fear and trepidation, converting events/plugin hooks to use elgg_ prefixed versions git-svn-id: http://code.elgg.org/elgg/trunk@7284 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/actions.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engine/lib/actions.php') diff --git a/engine/lib/actions.php b/engine/lib/actions.php index 35f9dc4b3..35ac224dc 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -92,7 +92,7 @@ function action($action, $forwarder = "") { // Trigger action event // @todo This is only called before the primary action is called. $event_result = true; - $event_result = trigger_plugin_hook('action', $action, null, $event_result); + $event_result = elgg_trigger_plugin_hook('action', $action, null, $event_result); // Include action // Event_result being false doesn't produce an error @@ -228,7 +228,7 @@ function validate_action_token($visibleerrors = TRUE, $token = NULL, $ts = NULL) // else says something to the contry we assume we're ok $returnval = true; - $returnval = trigger_plugin_hook('action_gatekeeper:permissions:check', 'all', array( + $returnval = elgg_trigger_plugin_hook('action_gatekeeper:permissions:check', 'all', array( 'token' => $token, 'time' => $ts ), $returnval); @@ -362,8 +362,8 @@ function actions_init() elgg_view_register_simplecache('js/languages/en'); - register_plugin_hook('action', 'all', 'ajax_action_hook'); - register_plugin_hook('forward', 'all', 'ajax_forward_hook'); + elgg_register_plugin_hook_handler('action', 'all', 'ajax_action_hook'); + elgg_register_plugin_hook_handler('forward', 'all', 'ajax_forward_hook'); } /** @@ -436,4 +436,4 @@ function ajax_action_hook() { } } -register_elgg_event_handler('init', 'system', 'actions_init'); \ No newline at end of file +elgg_register_event_handler('init', 'system', 'actions_init'); \ No newline at end of file -- cgit v1.2.3