diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-13 10:27:19 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-13 10:27:19 +0100 |
| commit | dbebe30c9a109e5be78590c4a49a71122ad411c6 (patch) | |
| tree | bed8526893b134a99d2545ab314d9275ebe06f55 /phpBB/includes/acp | |
| parent | d69012ea6d65e938a72f7accca498fc9feb2df0d (diff) | |
| parent | 03eb23cbae5281a0e75274e52d54e2b9250de99a (diff) | |
| download | forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.tar forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.tar.gz forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.tar.bz2 forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.tar.xz forums-dbebe30c9a109e5be78590c4a49a71122ad411c6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12176] Reword comment about config entries.
[ticket/12176] Add newest_user_colour to config array to ensure it exists
[ticket/12176] Display correct message when trying to delete founder.
[ticket/12176] Add functional test for founder deletion message.
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 603cb17941..c944f5f96f 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -173,8 +173,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')) { @@ -187,6 +186,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); |