mirror of
https://github.com/phpbb/phpbb.git
synced 2025-03-19 07:00:14 +01:00
[ticket/15248] Make use of event parameters of core.modify_posting_auth
Fixes is_authed and error not behaving as expected by extensions. PHPBB-15248
This commit is contained in:
parent
0984dbb3f8
commit
ca5243810f
@ -340,11 +340,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;
|
||||
}
|
||||
/**
|
||||
@ -393,13 +388,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)];
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user