aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-02-23 16:39:03 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-02-23 16:39:03 +0000
commit9655bea71acfac7e2168b21fd9ac3bf6ed9ac693 (patch)
tree7707e7a9b277d1e9824cdc90d4cb4496f9d60679
parent44d7ab6d1de7e5afc6bcc2901fbc376d244d4ace (diff)
downloadforums-9655bea71acfac7e2168b21fd9ac3bf6ed9ac693.tar
forums-9655bea71acfac7e2168b21fd9ac3bf6ed9ac693.tar.gz
forums-9655bea71acfac7e2168b21fd9ac3bf6ed9ac693.tar.bz2
forums-9655bea71acfac7e2168b21fd9ac3bf6ed9ac693.tar.xz
forums-9655bea71acfac7e2168b21fd9ac3bf6ed9ac693.zip
#7902
git-svn-id: file:///svn/phpbb/trunk@7043 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/acp/acp_prune.php7
-rw-r--r--phpBB/language/en/acp/prune.php1
2 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index 9e680e4714..484c936be5 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -301,9 +301,14 @@ class acp_prune
}
add_log('admin', $l_log, implode(', ', $usernames));
+ $msg = $user->lang['USER_' . strtoupper($action) . '_SUCCESS'];
+ }
+ else
+ {
+ $msg = $user->lang['USER_PRUNE_FAILURE'];
}
- trigger_error($user->lang['USER_' . strtoupper($action) . '_SUCCESS'] . adm_back_link($this->u_action));
+ trigger_error($msg . adm_back_link($this->u_action));
}
else
{
diff --git a/phpBB/language/en/acp/prune.php b/phpBB/language/en/acp/prune.php
index aec44a86c9..ad2a998c21 100644
--- a/phpBB/language/en/acp/prune.php
+++ b/phpBB/language/en/acp/prune.php
@@ -48,6 +48,7 @@ $lang = array_merge($lang, array(
'USER_DEACTIVATE_SUCCESS' => 'The selected users have been deactivated successfully.',
'USER_DELETE_SUCCESS' => 'The selected users have been deleted successfully.',
+ 'USER_PRUNE_FAILURE' => 'No users fit the selected criteria.',
'WRONG_ACTIVE_JOINED_DATE' => 'The date entered is wrong, it is expected in <kbd>YYYY-MM-DD</kbd> format.',
));