From 7ce009f2e29045b2bd29dd670c900b79f7f3bd70 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 12 Dec 2012 12:46:20 +0100
Subject: [ticket/10954] Mark forums read without popup or page refresh

PHPBB3-10954
---
 phpBB/includes/functions_display.php | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

(limited to 'phpBB/includes/functions_display.php')

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