adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

"Removing call to Controller::_initComponents(); and Controller::__mergeVars(); out of Dispatcher"

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6322 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2008-01-05 01:31:15 +00:00
parent 6e1f2fe457
commit c47700d8c4
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cake/dispatcher.php
View file

@ -219,10 +219,7 @@ class Dispatcher extends Object {
} }
Router::setRequestInfo(array($this->params, array('base' => $this->base, 'here' => $this->here, 'webroot' => $this->webroot))); Router::setRequestInfo(array($this->params, array('base' => $this->base, 'here' => $this->here, 'webroot' => $this->webroot)));
$controller->_mergeVars();
$controller->_initComponents();
$controller->constructClasses(); $controller->constructClasses();
$this->start($controller); $this->start($controller);
if ($privateAction) { if ($privateAction) {

4
cake/libs/controller/controller.php
View file

@ -313,7 +313,7 @@ class Controller extends Object {
* *
* @access protected * @access protected
*/ */
function _mergeVars () { function __mergeVars () {
$pluginName = Inflector::camelize($this->plugin); $pluginName = Inflector::camelize($this->plugin);
$pluginController = $pluginName . 'AppController'; $pluginController = $pluginName . 'AppController';
@ -372,6 +372,8 @@ class Controller extends Object {
* @see Controller::loadModel() * @see Controller::loadModel()
*/ */
function constructClasses() { function constructClasses() {
$this->__mergeVars();
$this->_initComponents();
if ($this->uses === null || ($this->uses === array())) { if ($this->uses === null || ($this->uses === array())) {
return false; return false;
} }