diff options
| author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-09-30 18:51:15 +0000 |
|---|---|---|
| committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2008-09-30 18:51:15 +0000 |
| commit | 6327e4d7fdf4f1bf39e4d463daef3613747bf38c (patch) | |
| tree | a4f4f08172a889bad913c0eb36eea3fb21edde50 | |
| parent | 3621d098c28a98cbe7be6fd2373337466fda9c6f (diff) | |
| download | elgg-6327e4d7fdf4f1bf39e4d463daef3613747bf38c.tar.gz elgg-6327e4d7fdf4f1bf39e4d463daef3613747bf38c.tar.bz2 | |
Minor tweaks
git-svn-id: https://code.elgg.org/elgg/trunk@2156 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/actions.php | 13 |
1 files changed, 8 insertions, 5 deletions
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'));
} |