aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-14 11:23:56 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-14 11:23:56 +0000
commita5eeffe3bd68c2fc06c20dc9633ab504a7ace0c2 (patch)
tree246816307b57dcf337f01a5716f936e63e3d0678
parent43168290231329c14668970b5be2bd5de192e551 (diff)
downloadelgg-a5eeffe3bd68c2fc06c20dc9633ab504a7ace0c2.tar.gz
elgg-a5eeffe3bd68c2fc06c20dc9633ab504a7ace0c2.tar.bz2
Fixes #2514 - separating action error messages for undefined and no action script file
git-svn-id: http://code.elgg.org/elgg/trunk@7080 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/actions.php2
-rw-r--r--languages/en.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index d164b14d6..18475de27 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -97,7 +97,7 @@ function action($action, $forwarder = "") {
// @todo make this better!
if ($event_result) {
if (!include($CONFIG->actions[$action]['file'])) {
- register_error(sprintf(elgg_echo('actionundefined'), $action));
+ register_error(sprintf(elgg_echo('actionnotfound'), $action));
}
}
} else {
diff --git a/languages/en.php b/languages/en.php
index 7953f12d6..d6b059a48 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -39,6 +39,7 @@ $english = array(
'exception:title' => "Fatal Error.",
'actionundefined' => "The requested action (%s) was not defined in the system.",
+ 'actionnotfound' => "The action file for %s was not found.",
'actionloggedout' => "Sorry, you cannot perform this action while logged out.",
'actionunauthorized' => 'You are unauthorized to perform this action',