diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-09-30 18:34:23 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-09-30 18:34:23 +0000 |
| commit | 3621d098c28a98cbe7be6fd2373337466fda9c6f (patch) | |
| tree | c7010b1613dbca3382d3db0215b773b2754219e1 /engine | |
| parent | b2f1d4cdbc745ff8a58a9d9b45fc2234c0192fe5 (diff) | |
| download | elgg-3621d098c28a98cbe7be6fd2373337466fda9c6f.tar.gz elgg-3621d098c28a98cbe7be6fd2373337466fda9c6f.tar.bz2 | |
Changed to plugin hook
git-svn-id: https://code.elgg.org/elgg/trunk@2155 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/actions.php | 5 |
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));
}
|