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

MINOR Rename setModel to setDataModel due to API changes

Browse Source
This commit is contained in:
Sean Harvey 2012-05-01 14:46:16 +12:00
parent 6d77709704
commit 7c54c60311
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/ContentController.php
View File

@ -136,7 +136,7 @@ class ContentController extends Controller {
public function handleRequest(SS_HTTPRequest $request, DataModel $model = null) { public function handleRequest(SS_HTTPRequest $request, DataModel $model = null) {
$child = null; $child = null;
$action = $request->param('Action'); $action = $request->param('Action');
$this->setModel($model); $this->setDataModel($model);
// If nested URLs are enabled, and there is no action handler for the current request then attempt to pass // If nested URLs are enabled, and there is no action handler for the current request then attempt to pass
// control to a child controller. This allows for the creation of chains of controllers which correspond to a // control to a child controller. This allows for the creation of chains of controllers which correspond to a

2
code/controllers/ModelAsController.php
View File

@ -38,7 +38,7 @@ class ModelAsController extends Controller implements NestedController {
*/ */
public function handleRequest(SS_HTTPRequest $request, DataModel $model) { public function handleRequest(SS_HTTPRequest $request, DataModel $model) {
$this->request = $request; $this->request = $request;
$this->setModel($model); $this->setDataModel($model);
$this->pushCurrent(); $this->pushCurrent();

2
code/controllers/RootURLController.php
View File

@ -106,7 +106,7 @@ class RootURLController extends Controller {
*/ */
public function handleRequest(SS_HTTPRequest $request, DataModel $model = null) { public function handleRequest(SS_HTTPRequest $request, DataModel $model = null) {
self::$is_at_root = true; self::$is_at_root = true;
$this->setModel($model); $this->setDataModel($model);
$this->pushCurrent(); $this->pushCurrent();
$this->init(); $this->init();