diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 23:15:43 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 23:15:43 +0000 |
commit | 60c1387a16ea4944674b0c9da2273158d1fbf0b4 (patch) | |
tree | 6f94aaf77a7d794f489212ff50f08f5211a18126 /engine/lib/actions.php | |
parent | ca08eb6d170d375ef4fca53604956f3474c7db19 (diff) | |
download | elgg-60c1387a16ea4944674b0c9da2273158d1fbf0b4.tar.gz elgg-60c1387a16ea4944674b0c9da2273158d1fbf0b4.tar.bz2 |
Merged r6757:6810 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6850 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/actions.php')
-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 47c0bf7af..c7abd5f18 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -54,14 +54,15 @@ function action($action, $forwarder = "") { if ((isadminloggedin()) || (!$CONFIG->actions[$action]['admin'])) { if ($CONFIG->actions[$action]['public'] || get_loggedin_userid()) { - // Trigger action event TODO: This is only called before the primary action is called. We need to rethink actions for 1.5 + // Trigger action event + // @todo This is only called before the primary action is called. We need to rethink actions for 1.5 $event_result = true; $event_result = trigger_plugin_hook('action', $action, null, $event_result); // Include action // Event_result being false doesn't produce an error - // since i assume this will be handled in the hook itself. - // TODO make this better! + // @todo make this better! if ($event_result) { if (!include($CONFIG->actions[$action]['file'])) { register_error(sprintf(elgg_echo('actionundefined'),$action)); |