MINOR Only set X-Pjax header in redirections if it doesn't already ex…

…ist in the response
silverstripe · Jun 14, 2012 · c81d0e1 · c81d0e1
1 parent e23a758
commit c81d0e1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
@@ -353,7 +353,9 @@ function handleRequest(SS_HTTPRequest $request, DataModel $model = null) {
 	function redirect($url, $code=302) {
 		if($this->request->isAjax()) {
 			$this->response->addHeader('X-ControllerURL', $url);
-			if($header = $this->request->getHeader('X-Pjax')) $this->response->addHeader('X-Pjax', $header);
+			if($this->request->getHeader('X-Pjax') && !$this->response->getHeader('X-Pjax')) {
+				$this->response->addHeader('X-Pjax', $this->request->getHeader('X-Pjax'));
+			}
 			return ''; // Actual response will be re-requested by client
 		} else {
 			parent::redirect($url, $code);