From 60be4c70a7e2e3b8a31420733f6389a6131b0334 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 7 Apr 2014 00:06:55 +0200
Subject: [PATCH] [ticket/12358] Correctly check and change the redirect url
 for ajax requests

PHPBB3-12358
---
 phpBB/includes/functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 8c29bc7171..69f7c3f162 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2437,19 +2437,19 @@ function meta_refresh($time, $url, $disable_cd_check = false)
 {
 	global $template, $refresh_data, $request;
 
+	$url = redirect($url, true, $disable_cd_check);
 	if ($request->is_ajax())
 	{
 		$refresh_data = array(
 			'time'	=> $time,
-			'url'		=> str_replace('&amp;', '&', $url)
+			'url'	=> $url,
 		);
 	}
 	else
 	{
-		$url = redirect($url, true, $disable_cd_check);
+		// For XHTML compatibility we change back & to &amp;
 		$url = str_replace('&', '&amp;', $url);
 
-		// For XHTML compatibility we change back & to &amp;
 		$template->assign_vars(array(
 			'META' => '<meta http-equiv="refresh" content="' . $time . '; url=' . $url . '" />')
 		);