From c8caeb8154b8b8451da152aecb4a8b517e9ca847 Mon Sep 17 00:00:00 2001
From: Loz Calver <lozcalver@bigfork.co.uk>
Date: Tue, 5 Nov 2013 10:36:46 +0000
Subject: [PATCH] Add X-Backurl header to CMS ajax requests

---
 admin/javascript/LeftAndMain.js | 12 ++++++++++--
 control/Controller.php          |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js
index 3255aa4c1..d28422260 100644
--- a/admin/javascript/LeftAndMain.js
+++ b/admin/javascript/LeftAndMain.js
@@ -284,9 +284,10 @@ jQuery.noConflict();
 			 *  - {Object} data Any additional data passed through to History.pushState()
 			 *  - {boolean} forceReload Forces the replacement of the current history state, even if the URL is the same, i.e. allows reloading.
 			 */
-			loadPanel: function(url, title, data, forceReload) {
+			loadPanel: function(url, title, data, forceReload, forceReferer) {
 				if(!data) data = {};
 				if(!title) title = "";
+				if (!forceReferer) forceReferer = History.getState().url;
 
 				// Check change tracking (can't use events as we need a way to cancel the current state change)
 				var contentEls = this._findFragments(data.pjax ? data.pjax.split(',') : ['Content']);
@@ -306,6 +307,7 @@ jQuery.noConflict();
 				this.saveTabState();
 				
 				if(window.History.enabled) {
+					$.extend(data, {__forceReferer: forceReferer});
 					// Active menu item is set based on X-Controller ajax header,
 					// which matches one class on the menu
 					if(forceReload) {
@@ -457,7 +459,13 @@ jQuery.noConflict();
 				// The actually returned view isn't always decided upon when the request
 				// is fired, so the server might decide to change it based on its own logic.
 				headers['X-Pjax'] = fragments;
-
+		
+				// Set 'fake' referer - we call pushState() before making the AJAX request, so we have to
+				// set our own referer here
+				if (typeof state.data.__forceReferer !== 'undefined') {
+					headers['X-Backurl'] = state.data.__forceReferer;
+				}
+				
 				contentEls.addClass('loading');
 				var xhr = $.ajax({
 					headers: headers,
diff --git a/control/Controller.php b/control/Controller.php
index 8f4ae4234..78f1c6e46 100644
--- a/control/Controller.php
+++ b/control/Controller.php
@@ -498,6 +498,8 @@ class Controller extends RequestHandler implements TemplateGlobalProvider {
 		if($this->request) {
 			if($this->request->requestVar('BackURL')) {
 				$url = $this->request->requestVar('BackURL');
+			} else if($this->request->isAjax() && $this->request->getHeader('X-Backurl')) {
+				$url = $this->request->getHeader('X-Backurl');
 			} else if($this->request->getHeader('Referer')) {
 				$url = $this->request->getHeader('Referer');
 			}