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

NOTFORMERGE: Merged r91209 from branches/2.4

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@91263 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2009-11-11 02:28:45 +00:00
parent 947fcc4060
commit 962109ff8a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/control/ModelAsController.php
View File

@ -49,10 +49,14 @@ class ModelAsController extends Controller implements NestedController {
return $this->response;
}
$result = $this->getNestedController();
try {
$result = $this->getNestedController();
if($result instanceof RequestHandler) {
$result = $result->handleRequest($this->request);
if($result instanceof RequestHandler) {
$result = $result->handleRequest($this->request);
}
} catch(SS_HTTPResponse_Exception $responseException) {
$result = $responseException->getResponse();
}
$this->popCurrent();