[FrameworkBundle] fixed typos (patch from Dennis.Verspuij)

fabpot · fabpot · commit e0961beb443a · 2010-10-08T10:19:30.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Form/Field.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Form/Field.php
@@ -56,7 +56,7 @@ public function widget(array $attributes = array(), $template = null)
         ));
     }
 
-    public function label($label, $template = null)
+    public function label($label = false, $template = null)
     {
         if (null === $template) {
             $template = 'FrameworkBundle:Form:label.php';
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/HtmlGenerator.php b/src/Symfony/Bundle/FrameworkBundle/Templating/HtmlGenerator.php
@@ -121,7 +121,7 @@ protected function doChoices(array $choices, array $selected)
             if (is_array($option)) {
                 $options[] = $this->contentTag(
                     'optgroup',
-                    "\n".renderChoices($option, $selected)."\n",
+                    "\n".$this->doChoices($option, $selected)."\n",
                     array('label' => $this->escape($key))
                 );
             } else {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function widget(array $attributes = array(), $template = null)`
`56`	`56`	`));`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function label($label, $template = null)`
	`59`	`+ public function label($label = false, $template = null)`
`60`	`60`	`{`
`61`	`61`	`if (null === $template) {`
`62`	`62`	`$template = 'FrameworkBundle:Form:label.php';`