From 120b983ad6aa7b9704ab46ffbe336909fb0e47b4 Mon Sep 17 00:00:00 2001
From: Loz Calver <lozcalver@bigfork.co.uk>
Date: Mon, 27 Apr 2015 15:38:45 +0100
Subject: [PATCH] FIX: X-Reload & X-ControllerURL didn't support absolute URLs
 (fixes #4119)

---
 admin/javascript/LeftAndMain.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js
index 2c62417a0..fb827fd48 100644
--- a/admin/javascript/LeftAndMain.js
+++ b/admin/javascript/LeftAndMain.js
@@ -633,8 +633,11 @@ jQuery.noConflict();
 
 				// Support a full reload
 				if(xhr.getResponseHeader('X-Reload') && xhr.getResponseHeader('X-ControllerURL')) {
-					document.location.href = $('base').attr('href').replace(/\/*$/, '')
-						+ '/' + xhr.getResponseHeader('X-ControllerURL');
+					var baseUrl = $('base').attr('href'),
+						rawURL = xhr.getResponseHeader('X-ControllerURL'),
+						url = $.path.isAbsoluteUrl(rawURL) ? rawURL : $.path.makeUrlAbsolute(rawURL, baseUrl);
+
+					document.location.href = url;
 					return;
 				}