From 6327e4d7fdf4f1bf39e4d463daef3613747bf38c Mon Sep 17 00:00:00 2001 From: marcus Date: Tue, 30 Sep 2008 18:51:15 +0000 Subject: Minor tweaks git-svn-id: https://code.elgg.org/elgg/trunk@2156 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/actions.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'engine') diff --git a/engine/lib/actions.php b/engine/lib/actions.php index 97d65e26e..f4a39bf47 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -59,11 +59,14 @@ $event_result = true; $event_result = trigger_plugin_hook('action', $action, null, $event_result); - // Include action - if (($event_result) && (@include($CONFIG->actions[$action]['file']))) { - } else { - register_error(sprintf(elgg_echo('actionundefined'),$action)); - } + // Include action + if ($event_result) // Event_result being false doesn't produce an error - since i assume this will be handled in the hook itself. TODO make this better! + { + if (@include($CONFIG->actions[$action]['file'])) { + } else { + register_error(sprintf(elgg_echo('actionundefined'),$action)); + } + } } else { register_error(elgg_echo('actionloggedout')); } -- cgit v1.2.3