Merge pull request #1676 from chrishow/form-label-html

Make HTML escaping optional for label contents.

laravel/documentation/views/forms.md

@@ -83,6 +83,14 @@ #### Specifying extra HTML attributes for a label:
 
 	echo Form::label('email', 'E-Mail Address', array('class' => 'awesome'));
 
+#### Turning off HTML escaping of label contents:
+
+	echo Form::label('confirm', 'Are you <strong>sure</strong> you want to proceed?', null, false);
+	
+You can pass ```false``` as the optional fourth argument to disable automatic HTML escaping of the label content.
+
+
+
 > **Note:** After creating a label, any form element you create with a name matching the label name will automatically receive an ID matching the label name as well.
 
 <a name="text"></a>

laravel/form.php

@@ -182,13 +182,15 @@ public static function token()
 	 * @param  array   $attributes
 	 * @return string
 	 */
-	public static function label($name, $value, $attributes = array())
+	public static function label($name, $value, $attributes = array(), $escape_html = true)
 	{
 		static::$labels[] = $name;
 
 		$attributes = HTML::attributes($attributes);
 
-		$value = HTML::entities($value);
+		if ($escape_html) {
+			$value = HTML::entities($value);
+		}
 
 		return '<label for="'.$name.'"'.$attributes.'>'.$value.'</label>';
 	}

laravel/tests/cases/form.test.php

@@ -111,9 +111,11 @@ public function testFormLabel()
 	{
 		$form1 = Form::label('foo', 'Foobar');
 		$form2 = Form::label('foo', 'Foobar', array('class' => 'control-label'));
+		$form3 = Form::label('foo', 'Foobar <i>baz</i>', null, false);
 
 		$this->assertEquals('<label for="foo">Foobar</label>', $form1);
 		$this->assertEquals('<label for="foo" class="control-label">Foobar</label>', $form2);
+		$this->assertEquals('<label for="foo">Foobar <i>baz</i></label>', $form3);
 	}
 
 	/**