Revert "Merge pull request #538 from mcammaert/2.1". Closes #2723

This reverts commit 96f73d6, reversing
changes made to 9d017c2.

Conflicts:

	lib/Cake/Test/Case/View/Helper/FormHelperTest.php

lib/Cake/Test/Case/View/Helper/FormHelperTest.php

@@ -6575,11 +6575,7 @@ public function testCreateCustomRoute() {
  */
 	public function testCreateWithInputDefaults() {
 		$this->Form->create('User', array(
-			'inputDefaults' => array(
-				'div' => false,
-				'label' => false,
-				'error' => array('attributes' => array('wrap' => 'small', 'class' => 'error'))
-			)
+			'inputDefaults' => array('div' => false, 'label' => false)
 		));
 		$result = $this->Form->input('username');
 		$expected = array(
@@ -6595,18 +6591,6 @@ public function testCreateWithInputDefaults() {
 			'/div'
 		);
 		$this->assertTags($result, $expected);
-
-		$User = ClassRegistry::getObject('User');
-		$User->validationErrors['username'] = array('empty');
-		$result = $this->Form->input('username', array('div' => true, 'label' => 'username', 'error' => array('empty' => __('Required'))));
-		$expected = array(
-			'div' => array('class' => 'input text error'),
-			'label' => array('for' => 'UserUsername'), 'username', '/label',
-			'input' => array('class' => 'form-error', 'type' => 'text', 'name' => 'data[User][username]', 'id' => 'UserUsername'),
-			'small' => array('class' => 'error'), 'Required', '/small',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
 	}
 
 /**

lib/Cake/View/Helper/FormHelper.php

@@ -936,7 +936,7 @@ public function inputs($fields = null, $blacklist = null) {
 	public function input($fieldName, $options = array()) {
 		$this->setEntity($fieldName);
 
-		$options = Set::merge(
+		$options = array_merge(
 			array('before' => null, 'between' => null, 'after' => null, 'format' => null),
 			$this->_inputDefaults,
 			$options