From ca5243810f313c5438e2c778cdaecfbcb375e8eb Mon Sep 17 00:00:00 2001 From: javiexin Date: Mon, 19 Jun 2017 23:29:54 +0200 Subject: [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 --- phpBB/posting.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'phpBB/posting.php') diff --git a/phpBB/posting.php b/phpBB/posting.php index 4651a1fd2c..d0fd2b60e8 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -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('
', $error)); } $message = $user->lang['LOGIN_EXPLAIN_' . strtoupper($mode)]; -- cgit v1.2.1