TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setComponentPropertiesFromParameters -> setComponentPropertiesFromParams

This commit is contained in:
Samuel Georges 2014-12-16 15:18:36 +11:00
parent a03d0cc8b4
commit b95eb5b342
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/cms/classes/Controller.php
View File

@ -431,7 +431,7 @@ class Controller extends BaseController
$this->vars[$alias] = $this->page->components[$alias] = $componentObj; $this->vars[$alias] = $this->page->components[$alias] = $componentObj;
} }
$this->setComponentPropertiesFromParameters($componentObj); $this->setComponentPropertiesFromParams($componentObj);
$componentObj->init(); $componentObj->init();
$componentObj->onInit(); // Deprecated: Remove ithis line if year >= 2015 $componentObj->onInit(); // Deprecated: Remove ithis line if year >= 2015
return $componentObj; return $componentObj;
@ -793,7 +793,7 @@ class Controller extends BaseController
'obj' => $componentObj 'obj' => $componentObj
]); ]);
$this->setComponentPropertiesFromParameters($componentObj, $parameters); $this->setComponentPropertiesFromParams($componentObj, $parameters);
$componentObj->init(); $componentObj->init();
$componentObj->onInit(); // Deprecated: Remove ithis line if year >= 2015 $componentObj->onInit(); // Deprecated: Remove ithis line if year >= 2015
} }
@ -1102,7 +1102,7 @@ class Controller extends BaseController
* @param array $parameters Specifies the partial parameters. * @param array $parameters Specifies the partial parameters.
* @return Returns updated properties. * @return Returns updated properties.
*/ */
protected function setComponentPropertiesFromParameters($component, $parameters = []) protected function setComponentPropertiesFromParams($component, $parameters = [])
{ {
$properties = $component->getProperties(); $properties = $component->getProperties();
$routerParameters = $this->router->getParameters(); $routerParameters = $this->router->getParameters();