tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-03 06:38:51 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pulls/3.1.12/SS-2015-010-director-forceredirect' into '3.1'

Browse Source 
FIX SS-2015-010

See merge request !2
This commit is contained in:
Hamish Friedlander 2015-03-20 17:56:40 +13:00
commit bcfeaef814
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
control/Director.php
View File

@ -796,14 +796,10 @@ class Director implements TemplateGlobalProvider {
* @param string $destURL - The URL to redirect to * @param string $destURL - The URL to redirect to
*/ */
protected static function force_redirect($destURL) { protected static function force_redirect($destURL) {
$response = new SS_HTTPResponse( $response = new SS_HTTPResponse();
"<h1>Your browser is not accepting header redirects</h1>". $response->redirect($destURL, 301);
"<p>Please <a href=\"$destURL\">click here</a>",
301
);
HTTP::add_cache_headers($response); HTTP::add_cache_headers($response);
$response->addHeader('Location', $destURL);
// TODO: Use an exception - ATM we can be called from _config.php, before Director#handleRequest's try block // TODO: Use an exception - ATM we can be called from _config.php, before Director#handleRequest's try block
$response->output(); $response->output();