From 9b9bef74160d4f91968a4fd1e4b9c829e560b8f2 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Fri, 3 Jun 2016 20:36:02 +1200
Subject: [PATCH] BUG Fix HTTP url rewriting

---
 control/HTTP.php           | 9 +++++----
 tests/control/HTTPTest.php | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/control/HTTP.php b/control/HTTP.php
index 65237a3d8ce..a6ae5ca8965 100644
--- a/control/HTTP.php
+++ b/control/HTTP.php
@@ -104,7 +104,7 @@ public static function absoluteURLs($html) {
 	 * @param string|callable $code Either a string that can evaluate to an expression to rewrite links
 	 * (depreciated), or a callable that takes a single parameter and returns the rewritten URL.
 	 *
-	 * @return The content with all links rewritten as per the logic specified in $code.
+	 * @return string The content with all links rewritten as per the logic specified in $code.
 	 */
 	public static function urlRewriter($content, $code) {
 		if(!is_callable($code)) {
@@ -132,14 +132,15 @@ public static function urlRewriter($content, $code) {
 
 		// Callback for regexp replacement
 		$callback = function($matches) use($code) {
+			// Decode HTML attribute
+			$URL = Convert::xml2raw($matches[2]);
 			if(is_callable($code)) {
-				$rewritten = $code($matches[2]);
+				$rewritten = $code($URL);
 			} else {
 				// Expose the $URL variable to be used by the $code expression
-				$URL = $matches[2];
 				$rewritten = eval("return ($code);");
 			}
-			return $matches[1] . $rewritten . $matches[3];
+			return $matches[1] . Convert::raw2xml($rewritten) . $matches[3];
 		};
 
 		// Execute each expression
diff --git a/tests/control/HTTPTest.php b/tests/control/HTTPTest.php
index d15bc3655c0..a2db615653d 100644
--- a/tests/control/HTTPTest.php
+++ b/tests/control/HTTPTest.php
@@ -278,6 +278,12 @@ public function testAbsoluteURLsAttributes() {
 				'<link href=http://www.silverstripe.org/base.css />',
 				HTTP::absoluteURLs('<link href=base.css />')
 			);
+
+			// Test special characters are retained
+			$test->assertEquals(
+				'<a href="http://www.silverstripe.org/Security/changepassword?m=3&amp;t=7214fdfde">password reset link</a>',
+				HTTP::absoluteURLs('<a href="/Security/changepassword?m=3&amp;t=7214fdfde">password reset link</a>')
+			);
 		});
 	}