ZF-4841: passing empty tag to Label decorator should remove tag [patch courtesy Steve Hollis]

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

library/Zend/Form/Decorator/Label.php

@@ -103,6 +103,9 @@ class Zend_Form_Decorator_Label extends Zend_Form_Decorator_Abstract
         } else {
             $this->_tag = (string) $tag;
         }
+
+        $this->removeOption('tag');
+
         return $this;
     }
 

tests/Zend/Form/Decorator/LabelTest.php

@@ -298,6 +298,19 @@ class Zend_Form_Decorator_LabelTest extends PHPUnit_Framework_TestCase
         $content = $this->decorator->render('');
         $this->assertTrue(empty($content), $content);
     }
+
+    /**
+     * @group ZF-4841
+     */
+    public function testSettingTagToEmptyValueShouldSetTagToNull()
+    {
+        $element = new Zend_Form_Element_Text('foo', array('label' => 'Foo'));
+        $this->decorator->setElement($element)
+                        ->setOptions(array('tag' => 'dt'));
+        $this->decorator->setTag('');
+        $tag = $this->decorator->getTag();
+        $this->assertTrue( NULL === $tag, $tag );
+    }
 }
 
 // Call Zend_Form_Decorator_LabelTest::main() if this source file is executed directly.