From e438c44670e91ca5f1dd5cf289c117c670ca2f26 Mon Sep 17 00:00:00 2001 From: marcus Date: Mon, 11 Aug 2008 14:57:57 +0000 Subject: Minor bugfix to actions_gatekeeper() git-svn-id: https://code.elgg.org/elgg/trunk@1834 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/actions.php | 7 ++++++- languages/en.php | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/engine/lib/actions.php b/engine/lib/actions.php index bc8b09589..28a16c403 100644 --- a/engine/lib/actions.php +++ b/engine/lib/actions.php @@ -138,10 +138,15 @@ { $returnval = true; // We have already got this far, so unless anything else says something to the contry we assume we're ok - return trigger_plugin_hook('action_gatekeeper:permissions:check', 'all', array( + $returnval = trigger_plugin_hook('action_gatekeeper:permissions:check', 'all', array( 'token' => $token, 'time' => $ts ), $returnval); + + if ($returnval) + return true; + else + register_error(elgg_echo('actiongatekeeper:pluginprevents')); } else register_error(elgg_echo('actiongatekeeper:timeerror')); diff --git a/languages/en.php b/languages/en.php index ba01080a0..eb11ecc0e 100644 --- a/languages/en.php +++ b/languages/en.php @@ -718,7 +718,8 @@ You cannot reply to this email.", */ 'actiongatekeeper:missingfields' => 'Form is missing __token or __ts fields', 'actiongatekeeper:tokeninvalid' => 'Token provided by form does not match that generated by server.', - 'actiongatekeeper:timeerror' => 'Form has expired, please refresh and try again.', + 'actiongatekeeper:timeerror' => 'Form has expired, please refresh and try again.', + 'actiongatekeeper:pluginprevents' => 'A extension has prevented this form from being submitted.', /** * Languages according to ISO 639-1 -- cgit v1.2.3