From eddb4203757366eef2afc81d53d948d3aaeed0c7 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Tue, 6 May 2014 14:54:51 -0700
Subject: [ticket/12510] Convert & to &amp; in build_url() when no params are
 stripped.

PHPBB3-12510
---
 phpBB/includes/functions.php | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 3480a338c0..a0e2a46f54 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2356,6 +2356,10 @@ function build_url($strip_vars = false)
 	{
 		$redirect = $phpbb_path_helper->strip_url_params($redirect, $strip_vars, false);
 	}
+	else
+	{
+		$redirect = str_replace('&', '&amp;', $redirect);
+	}
 
 	return $redirect . ((strpos($redirect, '?') === false) ? '?' : '');
 }
-- 
cgit v1.2.1