From 03e78c33fa85fab86ab0cb0802b33beada2a08d3 Mon Sep 17 00:00:00 2001 From: Cesar G Date: Sat, 2 Nov 2013 14:09:21 -0700 Subject: [PATCH] [ticket/11672] The json response call exits so the else is not necessary. PHPBB3-11672 --- phpBB/includes/mcp/mcp_queue.php | 34 +++++++++++--------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index c782d98fbc..3b5e3752f8 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -692,17 +692,13 @@ class mcp_queue 'visible' => true, )); } - else + $message .= '

' . $user->lang('RETURN_PAGE', '', ''); + + // If approving one post, also give links back to post... + if (sizeof($post_info) == 1 && $post_url) { - $message .= '

' . $user->lang('RETURN_PAGE', '', ''); - - // If approving one post, also give links back to post... - if (sizeof($post_info) == 1 && $post_url) - { - $message .= '

' . $user->lang('RETURN_POST', '', ''); - } + $message .= '

' . $user->lang('RETURN_POST', '', ''); } - trigger_error($message); } else @@ -836,17 +832,13 @@ class mcp_queue 'visible' => true, )); } - else + $message .= '

' . $user->lang('RETURN_PAGE', '', ''); + + // If approving one topic, also give links back to topic... + if (sizeof($topic_info) == 1 && $topic_url) { - $message .= '

' . $user->lang('RETURN_PAGE', '', ''); - - // If approving one topic, also give links back to topic... - if (sizeof($topic_info) == 1 && $topic_url) - { - $message .= '

' . $user->lang('RETURN_TOPIC', '', ''); - } + $message .= '

' . $user->lang('RETURN_TOPIC', '', ''); } - trigger_error($message); } else @@ -1157,11 +1149,7 @@ class mcp_queue 'visible' => false, )); } - else - { - $message .= '

' . $user->lang('RETURN_PAGE', '', ''); - } - + $message .= '

' . $user->lang('RETURN_PAGE', '', ''); trigger_error($message); } else