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

Fixing docblocks and code formatting in View class (Ticket #3371)

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5751 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2007-10-13 15:38:07 +00:00
parent 5a2a7c8f46
commit 52f582bf44
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
cake/libs/view/view.php
View file

@ -129,7 +129,7 @@ class View extends Object {
* Variables for the view
*
* @var array
* @access private
* @access public
*/
var $viewVars = array();
/**
@ -142,8 +142,8 @@ class View extends Object {
/**
* Title HTML element of this View.
*
* @var boolean
* @access private
* @var string
* @access public
*/
var $pageTitle = false;
/**
@ -181,13 +181,12 @@ class View extends Object {
* @access public
*/
var $autoLayout = true;
/**
* Array of parameter data
*
* @var array Parameter data
*/
var $params;
var $params = array();
/**
* True when the view has been rendered.
*
@ -203,7 +202,7 @@ class View extends Object {
/**
* File extension. Defaults to Cake's template ".ctp".
*
* @var array
* @var string
*/
var $ext = '.ctp';
/**
@ -213,13 +212,13 @@ class View extends Object {
*/
var $subDir = null;
/**
* Enter description here... Themes. New in Cake RC4.
* Theme name.
*
* @var array
* @var string
*/
var $themeWeb = null;
/**
* Plugin name. A Plugin is a sub-application. New in Cake RC4.
* Plugin name. A Plugin is a sub-application.
*
* @link http://manual.cakephp.org/chapter/plugins
* @var string
@ -358,9 +357,9 @@ class View extends Object {
$this->plugin = $params['plugin'];
$this->pluginPath = 'plugins' . DS . $this->plugin . DS;
$this->pluginPaths = array(
VIEWS . $this->pluginPath,
APP . $this->pluginPath . 'views' . DS,
);
VIEWS . $this->pluginPath,
APP . $this->pluginPath . 'views' . DS,
);
}
$paths = Configure::getInstance();
@ -419,6 +418,7 @@ class View extends Object {
}
$cacheFile = 'element_' . $key .'_'. $plugin . convertSlash($name);
$cache = cache('views' . DS . $cacheFile, null, $expires);
if (is_string($cache)) {
return $cache;
} else {
@ -484,11 +484,11 @@ class View extends Object {
}
} else {
return $this->cakeError('missingLayout', array(
array(
'layout' => $this->layout,
'file' => $layout_fn,
'base' => $this->base
)
array(
'layout' => $this->layout,
'file' => $layout_fn,
'base' => $this->base
)
));
}
}
@ -924,14 +924,16 @@ class View extends Object {
}
if (strpos($action, 'missingView') === false) {
return $this->cakeError('missingView', array(
array('className' => $this->name,
'action' => $this->action,
'file' => $viewFileName,
'base' => $this->base)));
return $this->cakeError('missingView', array(array(
'className' => $this->name,
'action' => $this->action,
'file' => $viewFileName,
'base' => $this->base
)));
exit();
}
}
}
}
?>