diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-02-15 01:19:28 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-02-15 02:27:54 +0100 |
| commit | 8960e6d77741b12025229b8e5ad7972fd571722e (patch) | |
| tree | 7ac59e7a030ac9917ea02f18bba48f6b7fef1169 /phpBB | |
| parent | 587241f3a9d5003f46699ec9fa9d44c7ca77edb2 (diff) | |
| download | forums-8960e6d77741b12025229b8e5ad7972fd571722e.tar forums-8960e6d77741b12025229b8e5ad7972fd571722e.tar.gz forums-8960e6d77741b12025229b8e5ad7972fd571722e.tar.bz2 forums-8960e6d77741b12025229b8e5ad7972fd571722e.tar.xz forums-8960e6d77741b12025229b8e5ad7972fd571722e.zip | |
[ticket/12176] Display correct message when trying to delete founder.
PHPBB3-12176
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 9 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 70e08f79f2..61d08a49cf 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -172,8 +172,7 @@ class acp_users if ($submit) { - // You can't delete the founder - if ($delete && $user_row['user_type'] != USER_FOUNDER) + if ($delete) { if (!$auth->acl_get('a_userdel')) { @@ -186,6 +185,12 @@ class acp_users trigger_error($user->lang['CANNOT_REMOVE_ANONYMOUS'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); } + // Founders can not be deleted. + if ($user_row['user_type'] == USER_FOUNDER) + { + trigger_error($user->lang['CANNOT_REMOVE_FOUNDER'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); + } + if ($user_id == $user->data['user_id']) { trigger_error($user->lang['CANNOT_REMOVE_YOURSELF'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING); diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 3b82a7022d..25e5ff8269 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -52,6 +52,7 @@ $lang = array_merge($lang, array( 'CANNOT_FORCE_REACT_FOUNDER' => 'You are not allowed to force reactivation on founder accounts.', 'CANNOT_FORCE_REACT_YOURSELF' => 'You are not allowed to force reactivation of your own account.', 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', + 'CANNOT_REMOVE_FOUNDER' => 'You are not allowed to remove founder accounts.', 'CANNOT_REMOVE_YOURSELF' => 'You are not allowed to remove your own user account.', 'CANNOT_SET_FOUNDER_IGNORED' => 'You are not able to promote ignored users to be founders.', 'CANNOT_SET_FOUNDER_INACTIVE' => 'You need to activate users before you promote them to founders, only activated users are able to be promoted.', |