Merge branch '1.3-misc' of code.cakephp.org:cakephp into 1.3-misc

This commit is contained in:
renan.saddam 2009-10-29 21:27:41 -02:00
commit 5c4bc35259

View file

@ -632,8 +632,6 @@ class FormHelper extends AppHelper {
$this->_inputDefaults,
$options
);
$defaults = array('before' => null, 'between' => null, 'after' => null);
$options = array_merge($defaults, $options);
if (!isset($this->fieldset[$this->model()])) {
//Try to load fieldset for this model