mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-30 21:40:43 +02:00
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/9637] Do not cache SQL server version in all cases [ticket/9629] Allow style.php to retrieve its session ID from cookies [ticket/9678] Flash attachments are not displayed in subsilver2. [ticket/9677] Subsilver2 is missing the bbcode-helpline for inline-attachments. [ticket/9650] Do not allow banning the anonymous user by username Conflicts: phpBB/styles/subsilver2/template/attachment.html phpBB/styles/subsilver2/template/posting_buttons.html
This commit is contained in:
@@ -231,6 +231,11 @@ class acp_users
|
||||
trigger_error($user->lang['CANNOT_BAN_YOURSELF'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
|
||||
}
|
||||
|
||||
if ($user_id == ANONYMOUS)
|
||||
{
|
||||
trigger_error($user->lang['CANNOT_BAN_ANONYMOUS'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
|
||||
}
|
||||
|
||||
if ($user_row['user_type'] == USER_FOUNDER)
|
||||
{
|
||||
trigger_error($user->lang['CANNOT_BAN_FOUNDER'] . adm_back_link($this->u_action . '&u=' . $user_id), E_USER_WARNING);
|
||||
|
Reference in New Issue
Block a user