tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Only set X-Pjax header in redirections if it doesn't already exist in the response

Browse Source
This commit is contained in:
Ingo Schommer 2012-06-14 20:20:29 +02:00
parent e23a7585a7
commit c81d0e1222
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/code/LeftAndMain.php
View File

@ -353,7 +353,9 @@ class LeftAndMain extends Controller implements PermissionProvider {
function redirect($url, $code=302) { function redirect($url, $code=302) {
if($this->request->isAjax()) { if($this->request->isAjax()) {
$this->response->addHeader('X-ControllerURL', $url); $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 return ''; // Actual response will be re-requested by client
} else { } else {
parent::redirect($url, $code); parent::redirect($url, $code);