From 3621d098c28a98cbe7be6fd2373337466fda9c6f Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 30 Sep 2008 18:34:23 +0000 Subject: Changed to plugin hook git-svn-id: https://code.elgg.org/elgg/trunk@2155 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/actions.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/lib/actions.php b/engine/lib/actions.php index 9eba53e67..97d65e26e 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -56,10 +56,11 @@ if ($CONFIG->actions[$action]['public'] || $_SESSION['id'] != -1) { // Trigger action event TODO: This is only called before the primary action is called. We need to rethink actions for 1.5 - trigger_elgg_event('action', $action); + $event_result = true; + $event_result = trigger_plugin_hook('action', $action, null, $event_result); // Include action - if (@include($CONFIG->actions[$action]['file'])) { + if (($event_result) && (@include($CONFIG->actions[$action]['file']))) { } else { register_error(sprintf(elgg_echo('actionundefined'),$action)); } -- cgit v1.2.3