adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 02:56:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making FormHelper::inputDefaults() code more readable

Browse source
This commit is contained in:
Tigran Gabrielyan 2012-05-21 13:56:51 -07:00
parent e58e3c5314
commit 671c31218f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/View/Helper/FormHelper.php
View file

@ -2592,7 +2592,11 @@ class FormHelper extends AppHelper {
*/
public function inputDefaults($defaults = null, $merge = false) {
if (!is_null($defaults)) {
$this->_inputDefaults = array_merge($merge ? $this->_inputDefaults : array(), (array)$defaults);
if ($merge) {
$this->_inputDefaults = array_merge($this->_inputDefaults, (array)$defaults);
} else {
$this->_inputDefaults = (array)$defaults;
}
}
return $this->_inputDefaults;
}