adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renaming _viewVars to viewVars in ThemeView

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4026 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2006-11-29 07:32:14 +00:00
parent 31f62cca32
commit dc90e5f749
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cake/libs/view/theme.php
View file

@ -97,19 +97,19 @@ class ThemeView extends View {
if (file_exists(APP . 'plugins' . DS . $this->plugin . DS . 'views' . DS . 'elements' . DS . $this->theme . DS . $name . $this->ext)) {
$file = APP . 'plugins' . DS . $this->plugin . DS . 'views' . DS . 'elements' . DS . $this->theme . DS . $name . $this->ext;
$params = array_merge_recursive($params, $this->loaded);
return $this->_render($file, array_merge($this->_viewVars, $params), false);
return $this->_render($file, array_merge($this->viewVars, $params), false);
} elseif (file_exists(APP . 'plugins' . DS . $this->plugin . DS . 'views' . DS . 'elements' . DS . $name . $this->ext)) {
$file = APP . 'plugins' . DS . $this->plugin . DS . 'views' . DS . 'elements' . DS . $name . $this->ext;
$params = array_merge_recursive($params, $this->loaded);
return $this->_render($file, array_merge($this->_viewVars, $params), false);
return $this->_render($file, array_merge($this->viewVars, $params), false);
} elseif (file_exists(APP . 'plugins' . DS . $this->plugin . DS . 'views' . DS . 'elements' . DS . $this->theme . DS . $name . '.thtml')) {
$file = APP . 'plugins' . DS . $this->plugin . DS . 'views' . DS . 'elements' . DS . $this->theme . DS . $name . '.thtml';
$params = array_merge_recursive($params, $this->loaded);
return $this->_render($file, array_merge($this->_viewVars, $params), false);
return $this->_render($file, array_merge($this->viewVars, $params), false);
} elseif (file_exists(APP . 'plugins' . DS . $this->plugin . DS . 'views' . DS . 'elements' . DS . $name . '.thtml')) {
$file = APP . 'plugins' . DS . $this->plugin . DS . 'views' . DS . 'elements' . DS . $name . '.thtml';
$params = array_merge_recursive($params, $this->loaded);
return $this->_render($file, array_merge($this->_viewVars, $params), false);
return $this->_render($file, array_merge($this->viewVars, $params), false);
}
}
@ -117,19 +117,19 @@ class ThemeView extends View {
foreach($paths->viewPaths as $path) {
if (file_exists($file)) {
$params = array_merge_recursive($params, $this->loaded);
return $this->_render($file, array_merge($this->_viewVars, $params), false);
return $this->_render($file, array_merge($this->viewVars, $params), false);
} elseif (file_exists($path . 'elements' . DS . $name . $this->ext)) {
$file = $path . 'elements' . DS . $name . $this->ext;
$params = array_merge_recursive($params, $this->loaded);
return $this->_render($file, array_merge($this->_viewVars, $params), false);
return $this->_render($file, array_merge($this->viewVars, $params), false);
} elseif (file_exists($this->themeElement . $name . '.thtml')) {
$file = $this->themeElement . $name . '.thtml';
$params = array_merge_recursive($params, $this->loaded);
return $this->_render($file, array_merge($this->_viewVars, $params), false);
return $this->_render($file, array_merge($this->viewVars, $params), false);
} elseif (file_exists($path . 'elements' . DS . $name . '.thtml')) {
$file = $path . 'elements' . DS . $name . '.thtml';
$params = array_merge_recursive($params, $this->loaded);
return $this->_render($file, array_merge($this->_viewVars, $params), false);
return $this->_render($file, array_merge($this->viewVars, $params), false);
}
}
return "(Error rendering Element: {$name})";