Made FormHelper::inputDefaults() alawys return inputDefaults array

cakephp · May 20, 2012 · 57ad5e2 · 57ad5e2
1 parent fd0dd7e
commit 57ad5e2
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
@@ -2588,17 +2588,13 @@ protected function _initInputField($field, $options = array()) {
  *
  * @param array $defaults New default values
  * @param boolean Merge with current defaults
- * @return mixed array|void Current inputDefaults
+ * @return array inputDefaults
  */
 	public function inputDefaults($defaults = null, $merge = false) {
-		if (is_null($defaults)) {
-			return $this->_inputDefaults;
-		}
-		if ($merge) {
-			$this->_inputDefaults = array_merge($this->_inputDefaults, (array)$defaults);
-		} else {
-			$this->_inputDefaults = (array)$defaults;
+		if (!is_null($defaults)) {
+			$this->_inputDefaults = array_merge($merge ? $this->_inputDefaults : array(), (array)$defaults);
 		}
+		return $this->_inputDefaults;
 	}
 
 }