diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 15:12:36 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-06-25 15:12:36 +0200 |
| commit | 68346e7dfb279f63493706cf66c83d4e6ce01b99 (patch) | |
| tree | a539e0e437c10ce4fdd0bd149e7d1f6d2859703d | |
| parent | 937cc1ca146ab3790b9f8ed2a099aeb0f2a2a5bc (diff) | |
| parent | 8938a0ce98c5f490abdd6c4149055c2f214ad04c (diff) | |
| download | forums-68346e7dfb279f63493706cf66c83d4e6ce01b99.tar forums-68346e7dfb279f63493706cf66c83d4e6ce01b99.tar.gz forums-68346e7dfb279f63493706cf66c83d4e6ce01b99.tar.bz2 forums-68346e7dfb279f63493706cf66c83d4e6ce01b99.tar.xz forums-68346e7dfb279f63493706cf66c83d4e6ce01b99.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/posting.php | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/phpBB/posting.php b/phpBB/posting.php index df2ef0d13c..5dc59fea6d 100644 --- a/phpBB/posting.php +++ b/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)]; |