mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
Some PHP5 notices.
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@310 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
8a806d7fc5
commit
ec53963d40
2 changed files with 15 additions and 11 deletions
|
@ -294,6 +294,7 @@ class Controller extends Object
|
|||
$view->parent =& $this->parent;
|
||||
$view->viewPath =& $this->viewPath;
|
||||
$view->params =& $this->params;
|
||||
$view->data =& $this->data;
|
||||
|
||||
foreach ($this->models as $key => $value)
|
||||
{
|
||||
|
|
|
@ -155,7 +155,7 @@ class View extends Object
|
|||
var $hasRendered = null;
|
||||
|
||||
var $modelsLoaded = false;
|
||||
|
||||
|
||||
function View(){
|
||||
}
|
||||
|
||||
|
@ -210,9 +210,9 @@ class View extends Object
|
|||
// What is reason for these being the same?
|
||||
if (isset($this->hasRendered) && $this->hasRendered)
|
||||
{
|
||||
//echo "<pre>";
|
||||
//print_r($this);
|
||||
//echo "</pre>";
|
||||
//echo "<pre>";
|
||||
//print_r($this);
|
||||
//echo "</pre>";
|
||||
return true;
|
||||
}
|
||||
else
|
||||
|
@ -474,13 +474,16 @@ class View extends Object
|
|||
require_once $helperFn;
|
||||
if(class_exists($helperCn)===true);
|
||||
{
|
||||
${$helper} = new $helperCn;
|
||||
${$helper}->base = $this->base;
|
||||
${$helper}->here = $this->here;
|
||||
${$helper}->params = $this->params;
|
||||
${$helper}->action = $this->action;
|
||||
//${$helper}->data = $this->data;
|
||||
//${$helper}->validationErrors = $this->validationErrors;
|
||||
${$helper} = new $helperCn;
|
||||
${$helper}->base = $this->base;
|
||||
${$helper}->here = $this->here;
|
||||
${$helper}->params = $this->params;
|
||||
${$helper}->action = $this->action;
|
||||
${$helper}->data = $this->data;
|
||||
if(!empty($this->validationErrors))
|
||||
{
|
||||
${$helper}->validationErrors = $this->validationErrors;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue