tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-06-28 07:29:32 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1039 from dnadesign/fixpopcurrentwarning

Browse Source 
FIX ensure controller stack is updated when execution halted by an exception
This commit is contained in:
Stig Lindqvist 2014-07-21 16:10:05 +12:00
commit 5107b08ac1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
code/controllers/ContentController.php
View File

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