From 7efc37d1f9d4a4335fc91af147cd059c17b7d45e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 12 Dec 2012 19:09:18 +0100
Subject: [ticket/10954] Modify is_ajax check for consistency

PHPBB3-10954
---
 phpBB/includes/functions_display.php | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 9745d493c4..f3198bc1e5 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -61,14 +61,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 		{
 			markread('all', false, false, request_var('mark_time', 0));
 
-			if (!$request->is_ajax())
-			{
-				trigger_error(
-					$user->lang['FORUMS_MARKED'] . '<br /><br />' .
-					sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
-				);
-			}
-			else
+			if ($request->is_ajax())
 			{
 				// Tell the ajax script what language vars need to be replaced
 				$data = array(
@@ -78,6 +71,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				$json_response = new phpbb_json_response();
 				$json_response->send($data);
 			}
+
+			trigger_error(
+				$user->lang['FORUMS_MARKED'] . '<br /><br />' .
+				sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
+			);
 		}
 		else
 		{
@@ -326,11 +324,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 			$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
 			meta_refresh(3, $redirect);
 
-			if (!$request->is_ajax())
-			{
-				trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
-			}
-			else
+			if ($request->is_ajax())
 			{
 				// Tell the ajax script what language vars need to be replaced
 				$data = array(
@@ -340,6 +334,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
 				$json_response = new phpbb_json_response();
 				$json_response->send($data);
 			}
+
+			trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
 		}
 		else
 		{
-- 
cgit v1.2.1