aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/actions.php5
1 files 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));
}