From 57ad5e2573198781deb1586242f62a5b62fe26f9 Mon Sep 17 00:00:00 2001
From: Tigran Gabrielyan <tigrangab@gmail.com>
Date: Sun, 20 May 2012 15:51:48 -0700
Subject: [PATCH] Made FormHelper::inputDefaults() alawys return inputDefaults
 array

---
 lib/Cake/View/Helper/FormHelper.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
index 24489c38b..ae93b0837 100644
--- a/lib/Cake/View/Helper/FormHelper.php
+++ b/lib/Cake/View/Helper/FormHelper.php
@@ -2588,17 +2588,13 @@ class FormHelper extends AppHelper {
  *
  * @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;
 	}
 
 }