Преглед изворни кода

Added test for providing a filter to a tag.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@20286 44c647ce-9c0f-0410-b52a-842ac1e357ba
kokx пре 16 година
родитељ
комит
453abfa4b1
2 измењених фајлова са 14 додато и 1 уклоњено
  1. 1 1
      library/Zend/Markup/Renderer/Html.php
  2. 13 0
      tests/Zend/Markup/BbcodeAndHtmlTest.php

+ 1 - 1
library/Zend/Markup/Renderer/Html.php

@@ -343,7 +343,7 @@ class Zend_Markup_Renderer_Html extends Zend_Markup_Renderer_RendererAbstract
      */
      */
     public function setDefaultFilter(Zend_Filter_Interface $filter = null)
     public function setDefaultFilter(Zend_Filter_Interface $filter = null)
     {
     {
-        if (empty($filter)) {
+        if (null === $filter) {
             $this->_defaultFilter = new Zend_Filter();
             $this->_defaultFilter = new Zend_Filter();
 
 
             $this->_defaultFilter->addFilter(new Zend_Filter_HtmlEntities());
             $this->_defaultFilter->addFilter(new Zend_Filter_HtmlEntities());

+ 13 - 0
tests/Zend/Markup/BbcodeAndHtmlTest.php

@@ -395,6 +395,19 @@ BBCODE;
         $this->assertEquals('<strong>HELLO</strong>', $m->render('[b]hello[/b]'));
         $this->assertEquals('<strong>HELLO</strong>', $m->render('[b]hello[/b]'));
     }
     }
 
 
+    public function testProvideFilterChainToTag()
+    {
+        $m = $this->_markup;
+
+        $filter = new Zend_Filter_HtmlEntities();
+
+        $this->_markup->addMarkup('suppp',
+            Zend_Markup_Renderer_RendererAbstract::TYPE_REPLACE | Zend_Markup_Renderer_RendererAbstract::TAG_NORMAL,
+            array('start' => '<sup>', 'end' => '</sup>', 'group' => 'inline', 'filter' => $filter));
+        $this->assertEquals("filter<br />\n<sup>filter\n&amp;\nfilter</sup>",
+            $m->render("filter\n[suppp]filter\n&\nfilter[/suppp]"));
+    }
+
 }
 }
 
 
 // Call Zend_Markup_BbcodeAndHtmlTest::main()
 // Call Zend_Markup_BbcodeAndHtmlTest::main()