mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX Fixed merge error in ModelAsController
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60224 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
a0f61006d0
commit
d6463f0b1f
@ -15,7 +15,7 @@ class ModelAsController extends Controller implements NestedController {
|
|||||||
$this->init();
|
$this->init();
|
||||||
$nested = $this->getNestedController();
|
$nested = $this->getNestedController();
|
||||||
if(is_object($nested)) {
|
if(is_object($nested)) {
|
||||||
$result = $nested->handleRequest($requestParams);
|
$result = $nested->handleRequest($request);
|
||||||
} else {
|
} else {
|
||||||
$result = $nested;
|
$result = $nested;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user