mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 16:10:38 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander 2017-06-25 15:12:39 +02:00
commit 6b55ae7573
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 3 additions and 8 deletions

11
phpBB/posting.php

@ -341,11 +341,6 @@ switch ($mode)
$is_authed = true;
$mode = 'soft_delete';
}
else if (!$is_authed)
{
// Display the same error message for softdelete we use for delete
$mode = 'delete';
}
break;
}
/**
@ -394,13 +389,13 @@ $vars = array(
);
extract($phpbb_dispatcher->trigger_event('core.modify_posting_auth', compact($vars)));
if (!$is_authed)
if (!$is_authed || !empty($error))
{
$check_auth = ($mode == 'quote') ? 'reply' : $mode;
$check_auth = ($mode == 'quote') ? 'reply' : (($mode == 'soft_delete') ? 'delete' : $mode);
if ($user->data['is_registered'])
{
trigger_error('USER_CANNOT_' . strtoupper($check_auth));
trigger_error(empty($error) ? 'USER_CANNOT_' . strtoupper($check_auth) : implode('<br/>', $error));
}
$message = $user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)];