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

Refactoring Controller::set() and removing Controller::_setArray()

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@3407 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
nate 2006-08-18 07:58:10 +00:00
parent 8fadeb3146
commit cfa4ed3516
1 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -431,23 +431,35 @@ class Controller extends Object {
* @param mixed $one A string or an array of data. * @param mixed $one A string or an array of data.
* @param mixed $two Value in case $one is a string (which then works as the key). * @param mixed $two Value in case $one is a string (which then works as the key).
* Unused if $one is an associative array, otherwise serves as the values to $one's keys. * Unused if $one is an associative array, otherwise serves as the values to $one's keys.
* @return unknown * @return void
*/ */
function set($one, $two = null) { function set($one, $two = null) {
$data = array();
if (is_array($one)) { if (is_array($one)) {
if (is_array($two)) { if (is_array($two)) {
return $this->_setArray(array_combine($one, $two)); $data = array_combine($one, $two);
} else { } else {
return $this->_setArray($one); $data = $one;
} }
} else { } else {
return $this->_setArray(array($one => $two)); $data = array($one => $two);
}
foreach($data as $name => $value) {
if ($name == 'title') {
$this->pageTitle = $value;
} else {
$this->_viewVars[$name] = $value;
}
} }
} }
/** /**
* Enter description here... * Internally redirects one action to another
* *
* @param unknown_type $action * @param string $action The new action to be redirected to
* @param mixed Any other parameters passed to this method will be passed as
* parameters to the new action.
*/ */
function setAction($action) { function setAction($action) {
$this->action = $action; $this->action = $action;
@ -540,25 +552,7 @@ class Controller extends Object {
} }
} }
/** /**
* Sets data for this view. Will set title if the key "title" is in given $data array. * @deprecated
*
* @param array $data Array of
* @access private
*/
function _setArray($data) {
foreach($data as $name => $value) {
if ($name == 'title') {
$this->_setTitle($value);
} else {
$this->_viewVars[$name] = $value;
}
}
}
/**
* Set the title element of the page.
*
* @param string $pageTitle Text for the title
* @access private
*/ */
function _setTitle($pageTitle) { function _setTitle($pageTitle) {
$this->pageTitle = $pageTitle; $this->pageTitle = $pageTitle;