diff --git a/laravel/documentation/views/forms.md b/laravel/documentation/views/forms.md
index cee6287a..538fd935 100644
--- a/laravel/documentation/views/forms.md
+++ b/laravel/documentation/views/forms.md
@@ -83,6 +83,14 @@ Laravel provides an easy method of protecting your application from cross-site r
echo Form::label('email', 'E-Mail Address', array('class' => 'awesome'));
+#### Turning off HTML escaping of label contents:
+
+ echo Form::label('confirm', 'Are you sure 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.
diff --git a/laravel/form.php b/laravel/form.php
index 5a450b52..d14cad69 100644
--- a/laravel/form.php
+++ b/laravel/form.php
@@ -182,13 +182,15 @@ class Form {
* @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 '';
}
diff --git a/laravel/tests/cases/form.test.php b/laravel/tests/cases/form.test.php
index 5f6f7fa3..8791dfd1 100644
--- a/laravel/tests/cases/form.test.php
+++ b/laravel/tests/cases/form.test.php
@@ -111,9 +111,11 @@ class FormTest extends PHPUnit_Framework_TestCase {
{
$form1 = Form::label('foo', 'Foobar');
$form2 = Form::label('foo', 'Foobar', array('class' => 'control-label'));
+ $form3 = Form::label('foo', 'Foobar baz', null, false);
$this->assertEquals('', $form1);
$this->assertEquals('', $form2);
+ $this->assertEquals('', $form3);
}
/**