makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15248] Make use of event parameters of core.modify_posting_auth

Browse source 
Fixes is_authed and error not behaving as expected by extensions.

PHPBB-15248
This commit is contained in:
javiexin 2017-06-19 23:29:54 +02:00
parent 0984dbb3f8
commit ca5243810f
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/posting.php
View file

@ -340,11 +340,6 @@ switch ($mode)
$is_authed = true; $is_authed = true;
$mode = 'soft_delete'; $mode = 'soft_delete';
} }
else if (!$is_authed)
{
// Display the same error message for softdelete we use for delete
$mode = 'delete';
}
break; break;
} }
/** /**
@ -393,13 +388,13 @@ $vars = array(
); );
extract($phpbb_dispatcher->trigger_event('core.modify_posting_auth', compact($vars))); 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']) 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)]; $message = $user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)];