default options are lost in case of eg. validation error

This commit is contained in:
Manu Cammaert 2012-02-28 23:39:16 +01:00
parent 6599422a7a
commit cd2dca205c

View file

@ -946,7 +946,7 @@ class FormHelper extends AppHelper {
public function input($fieldName, $options = array()) { public function input($fieldName, $options = array()) {
$this->setEntity($fieldName); $this->setEntity($fieldName);
$options = array_merge( $options = Set::merge(
array('before' => null, 'between' => null, 'after' => null, 'format' => null), array('before' => null, 'between' => null, 'after' => null, 'format' => null),
$this->_inputDefaults, $this->_inputDefaults,
$options $options