ZF-2989: switch empty Label from   to  

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22128 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Form/Decorator/DtDdWrapper.php

@@ -47,17 +47,24 @@ class Zend_Form_Decorator_DtDdWrapper extends Zend_Form_Decorator_Abstract
      * Render
      *
      * Renders as the following:
-     * <dt></dt>
+     * <dt>$dtLabel</dt>
      * <dd>$content</dd>
      *
+     * $dtLabel can be set via 'dtLabel' option, defaults to '\&#160;'
+     * 
      * @param  string $content
      * @return string
      */
     public function render($content)
     {
         $elementName = $this->getElement()->getName();
+        
+        $dtLabel = $this->getOption('dtLabel');
+        if( null === $dtLabel ) {
+            $dtLabel = '&#160;';
+        }
 
-        return '<dt id="' . $elementName . '-label">&nbsp;</dt>' .
+        return '<dt id="' . $elementName . '-label">' . $dtLabel . '</dt>' .
                '<dd id="' . $elementName . '-element">' . $content . '</dd>';
     }
 }

library/Zend/Form/Decorator/Label.php

@@ -310,7 +310,7 @@ class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract
             $options['class'] = $class;
             $label = $view->formLabel($element->getFullyQualifiedName(), trim($label), $options);
         } else {
-            $label = ' ';
+            $label = ' ';
         }
 
         if (null !== $tag) {

tests/Zend/Form/DisplayGroupTest.php

@@ -401,7 +401,7 @@ class Zend_Form_DisplayGroupTest extends PHPUnit_Framework_TestCase
 
         $this->group->addElements(array($foo, $bar));
         $html = $this->group->render($this->getView());
-        $this->assertRegexp('#^<dt[^>]*>&nbsp;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
+        $this->assertRegexp('#^<dt[^>]*>&\#160;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
         $this->assertContains('<input', $html, $html);
         $this->assertContains('"foo"', $html);
         $this->assertContains('"bar"', $html);
@@ -415,7 +415,7 @@ class Zend_Form_DisplayGroupTest extends PHPUnit_Framework_TestCase
         $this->group->addElements(array($foo, $bar))
                     ->setView($this->getView());
         $html = $this->group->__toString();
-        $this->assertRegexp('#^<dt[^>]*>&nbsp;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
+        $this->assertRegexp('#^<dt[^>]*>&\#160;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
         $this->assertContains('<input', $html);
         $this->assertContains('"foo"', $html);
         $this->assertContains('"bar"', $html);

tests/Zend/Form/Element/RadioTest.php

@@ -168,7 +168,7 @@ class Zend_Form_Element_RadioTest extends PHPUnit_Framework_TestCase
                 'test' => 'Test',
             ));
         $html = $this->element->render($this->getView());
-        $this->assertRegexp('#<dt[^>]*>&nbsp;</dt>.*?<dd#s', $html, $html);
+        $this->assertRegexp('#<dt[^>]*>&\#160;</dt>.*?<dd#s', $html, $html);
     }
 
     /**

tests/Zend/Form/FormTest.php

@@ -4040,7 +4040,7 @@ class Zend_Form_FormTest extends PHPUnit_Framework_TestCase
 
         $html = $form->render();
 
-        $this->assertContains('<dt id="foo-label">&nbsp;</dt>', $html);
+        $this->assertContains('<dt id="foo-label">&#160;</dt>', $html);
         $this->assertContains('<dd id="foo-element">', $html);
     }
 
@@ -4056,7 +4056,7 @@ class Zend_Form_FormTest extends PHPUnit_Framework_TestCase
 
         $html = $form->render();
 
-        $this->assertContains('<dt id="testform-label">&nbsp;</dt>', $html);
+        $this->assertContains('<dt id="testform-label">&#160;</dt>', $html);
         $this->assertContains('<dd id="testform-element">', $html);
     }
 

tests/Zend/Form/SubFormTest.php

@@ -130,7 +130,7 @@ class Zend_Form_SubFormTest extends PHPUnit_Framework_TestCase
         $form->addSubForm($subForm, 'foobar')
              ->setView(new Zend_View);
         $html = $form->render();
-        $this->assertContains('<dt>&nbsp;</dt>', $html);
+        $this->assertContains('<dt>&#160;</dt>', $html);
     }
 }