From cd2dca205c86c4da151417c6a74e568111795ec9 Mon Sep 17 00:00:00 2001
From: Manu Cammaert <manu.cammaert@me.com>
Date: Tue, 28 Feb 2012 23:39:16 +0100
Subject: [PATCH] default options are lost in case of eg. validation error

---
 lib/Cake/View/Helper/FormHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
index 8e7ef063b..245c2d974 100644
--- a/lib/Cake/View/Helper/FormHelper.php
+++ b/lib/Cake/View/Helper/FormHelper.php
@@ -946,7 +946,7 @@ class FormHelper extends AppHelper {
 	public function input($fieldName, $options = array()) {
 		$this->setEntity($fieldName);
 
-		$options = array_merge(
+		$options = Set::merge(
 			array('before' => null, 'between' => null, 'after' => null, 'format' => null),
 			$this->_inputDefaults,
 			$options