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 Keep X-ControllerURL canonical by not re-constructing with question mark if there's no GET string (caused duplicate HTML5 pushState requests)

Browse Source
This commit is contained in:
Ingo Schommer 2012-03-30 18:09:03 +02:00
parent af80ab5ab7
commit 0414e42bbc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/code/LeftAndMain.php
View File

@ -332,7 +332,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
$url = $request->getURL(); $url = $request->getURL();
if($getVars = $request->getVars()) { if($getVars = $request->getVars()) {
if(isset($getVars['url'])) unset($getVars['url']); if(isset($getVars['url'])) unset($getVars['url']);
$url = Controller::join_links($url, '?' . http_build_query($getVars)); $url = Controller::join_links($url, $getVars ? '?' . http_build_query($getVars) : '');
} }
$response->addHeader('X-ControllerURL', $url); $response->addHeader('X-ControllerURL', $url);
} }