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

FIX ensure controller stack is updated when execution halted by an exception.

Browse Source 
See: https://github.com/silverstripe/silverstripe-framework/issues/2467

popCurrent would be incorrectly not pop a controller from the controller stack if an exception was throw from inside the handleRequest() method.

This change captures the exception, ensures the controller is popped from the stack and passes the exception along.
This commit is contained in:
Will Rossiter 2014-07-01 14:18:53 +12:00
parent a1286f1c0f
commit a777266e43
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/controllers/ContentController.php
View File

@ -193,8 +193,18 @@ class ContentController extends Controller {
} }
Director::set_current_page($this->data()); Director::set_current_page($this->data());
try {
$response = parent::handleRequest($request, $model); $response = parent::handleRequest($request, $model);
Director::set_current_page(null); Director::set_current_page(null);
} catch(SS_HTTPResponse_Exception $e) {
$this->popCurrent();
Director::set_current_page(null);
throw $e;
}
} }
return $response; return $response;