From 830276508b3cd8c658dfe67f00138de0194c5cae Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 5 Nov 2006 18:13:35 +0000 Subject: [PATCH] - #5120 - #5104 git-svn-id: file:///svn/phpbb/trunk@6555 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/acp/acp_reasons.php | 2 +- phpBB/posting.php | 2 +- phpBB/report.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/includes/acp/acp_reasons.php index 0dd62b5e22..72419de1ef 100644 --- a/phpBB/includes/acp/acp_reasons.php +++ b/phpBB/includes/acp/acp_reasons.php @@ -81,7 +81,7 @@ class acp_reasons $row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - if ($row || ($add && strtolower($reason_row['reason_title']) == 'other')) + if ($row || ($action == 'add' && strtolower($reason_row['reason_title']) == 'other')) { $error[] = $user->lang['REASON_ALREADY_EXIST']; } diff --git a/phpBB/posting.php b/phpBB/posting.php index cb55c4d0b8..aa79f31167 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -118,12 +118,12 @@ switch ($mode) default: $sql = ''; - trigger_error('NO_POST_MODE'); break; } if (!$sql) { + $user->setup(array('posting', 'mcp', 'viewtopic')); trigger_error('NO_POST_MODE'); } diff --git a/phpBB/report.php b/phpBB/report.php index 6328540064..9679e23d6c 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -31,7 +31,7 @@ $submit = (isset($_POST['submit'])) ? true : false; if (!$post_id) { - trigger_error('INVALID_MODE'); + trigger_error('NO_POST_SELECTED'); } $redirect_url = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&p=$post_id") . "#p$post_id";