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

FIX: Ensure that Director::test() doesn't return a string

Browse Source
This commit is contained in:
Sam Minnee 2013-02-25 16:27:44 +13:00
parent 5734c2b3de
commit b2dfa77056
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
control/Director.php
View File

@ -224,6 +224,17 @@ class Director implements TemplateGlobalProvider {
if($headers) foreach($headers as $k => $v) $request->addHeader($k, $v);
// TODO: Pass in the DataModel
$result = Director::handleRequest($request, $session, DataModel::inst());
// Ensure that the result is an SS_HTTPResponse object
if(is_string($result)) {
if(substr($result,0,9) == 'redirect:') {
$response = new SS_HTTPResponse();
$response->redirect(substr($result, 9));
$result = $response;
} else {
$result = new SS_HTTPResponse($result);
}
}
// Restore the superglobals
$_REQUEST = $existingRequestVars;