Remove the before/after options.

They have been systematically removed from the helper. They have been
replaced everywhere with templates.

src/View/Helper/FormHelper.php

@@ -1463,8 +1463,6 @@ class FormHelper extends Helper {
  *
  * - `div` - Include a wrapping div?  Defaults to true. Accepts sub options similar to
  *   FormHelper::input().
- * - `before` - Content to include before the input.
- * - `after` - Content to include after the input.
  * - `type` - Set to 'reset' for reset inputs. Defaults to 'submit'
  * - Other attributes will be assigned to the input element.
  *
@@ -1506,15 +1504,10 @@ class FormHelper extends Helper {
 		}
 
 		if (isset($options['name'])) {
-			$name = str_replace(array('[', ']'), array('.', ''), $options['name']);
 			$this->_secure($options['secure'], $this->_secureFieldName($options));
 		}
 		unset($options['secure']);
 
-		$before = $options['before'];
-		$after = $options['after'];
-		unset($options['before'], $options['after']);
-
 		$isUrl = strpos($caption, '://') !== false;
 		$isImage = preg_match('/\.(jpg|jpe|jpeg|gif|png|ico)$/', $caption);
 
@@ -1546,7 +1539,7 @@ class FormHelper extends Helper {
 			$options['value'] = $caption;
 			$tag = $this->Html->useTag('submit', $options);
 		}
-		$out = $before . $tag . $after;
+		$out = $tag;
 
 		if (isset($divOptions)) {
 			$tag = $divOptions['tag'];

tests/TestCase/View/Helper/FormHelperTest.php

@@ -5253,14 +5253,6 @@ class FormHelperTest extends TestCase {
 		$expected = array('input' => array('type' => 'submit', 'value' => 'Test Submit', 'class' => 'save'));
 		$this->assertTags($result, $expected);
 
-		$result = $this->Form->submit('Test Submit', array('div' => array('id' => 'SaveButton')));
-		$expected = array(
-			'div' => array('class' => 'submit', 'id' => 'SaveButton'),
-			'input' => array('type' => 'submit', 'value' => 'Test Submit'),
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
 		$result = $this->Form->submit('Next >');
 		$expected = array(
 			'div' => array('class' => 'submit'),
@@ -5284,36 +5276,6 @@ class FormHelperTest extends TestCase {
 			'/div'
 		);
 		$this->assertTags($result, $expected);
-
-		$before = '--before--';
-		$after = '--after--';
-		$result = $this->Form->submit('Test', array('before' => $before));
-		$expected = array(
-			'div' => array('class' => 'submit'),
-			'--before--',
-			'input' => array('type' => 'submit', 'value' => 'Test'),
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Form->submit('Test', array('after' => $after));
-		$expected = array(
-			'div' => array('class' => 'submit'),
-			'input' => array('type' => 'submit', 'value' => 'Test'),
-			'--after--',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Form->submit('Test', array('before' => $before, 'after' => $after));
-		$expected = array(
-			'div' => array('class' => 'submit'),
-			'--before--',
-			'input' => array('type' => 'submit', 'value' => 'Test'),
-			'--after--',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
 	}
 
 /**
@@ -5353,46 +5315,6 @@ class FormHelperTest extends TestCase {
 			'/div'
 		);
 		$this->assertTags($result, $expected);
-
-		$after = '--after--';
-		$before = '--before--';
-		$result = $this->Form->submit('cake.power.gif', array('after' => $after));
-		$expected = array(
-			'div' => array('class' => 'submit'),
-			'input' => array('type' => 'image', 'src' => 'img/cake.power.gif'),
-			'--after--',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Form->submit('cake.power.gif', array('before' => $before));
-		$expected = array(
-			'div' => array('class' => 'submit'),
-			'--before--',
-			'input' => array('type' => 'image', 'src' => 'img/cake.power.gif'),
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Form->submit('cake.power.gif', array('before' => $before, 'after' => $after));
-		$expected = array(
-			'div' => array('class' => 'submit'),
-			'--before--',
-			'input' => array('type' => 'image', 'src' => 'img/cake.power.gif'),
-			'--after--',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
-
-		$result = $this->Form->submit('Not.an.image', array('before' => $before, 'after' => $after));
-		$expected = array(
-			'div' => array('class' => 'submit'),
-			'--before--',
-			'input' => array('type' => 'submit', 'value' => 'Not.an.image'),
-			'--after--',
-			'/div'
-		);
-		$this->assertTags($result, $expected);
 	}
 
 /**