Fixed some unclear functions.

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

library/Zend/Markup/Renderer/Html.php

@@ -337,20 +337,16 @@ class Zend_Markup_Renderer_Html extends Zend_Markup_Renderer_RendererAbstract
     }
 
     /**
-     * Set the default filter
+     * Add the default filters
      *
      * @return void
      */
-    public function setDefaultFilter(Zend_Filter_Interface $filter = null)
+    public function addDefaultFilters()
     {
-        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_Callback('nl2br'));
-        } else {
-            $this->_defaultFilter = $filter;
-        }
+        $this->_defaultFilter->addFilter(new Zend_Filter_HtmlEntities());
+        $this->_defaultFilter->addFilter(new Zend_Filter_Callback('nl2br'));
     }
 
     /**

library/Zend/Markup/Renderer/RendererAbstract.php

@@ -128,7 +128,7 @@ abstract class Zend_Markup_Renderer_RendererAbstract
             $this->removeDefaultTags();
         }
         if (!isset($options['useDefaultFilters']) || ($options['useDefaultFilters'] === true)) {
-            $this->setDefaultFilter();
+            $this->addDefaultFilters();
         }
         if (isset($options['defaultFilter'])) {
             $this->addDefaultFilter($options['defaultFilter']);
@@ -502,7 +502,7 @@ abstract class Zend_Markup_Renderer_RendererAbstract
      *
      * @return void
      */
-    public function addDefaultfilter(Zend_Filter_Interface $filter, $placement = Zend_Filter::CHAIN_APPEND)
+    public function addDefaultFilter(Zend_Filter_Interface $filter, $placement = Zend_Filter::CHAIN_APPEND)
     {
         if (!($this->_defaultFilter instanceof Zend_Filter)) {
             $defaultFilter = new Zend_Filter();
@@ -514,11 +514,21 @@ abstract class Zend_Markup_Renderer_RendererAbstract
     }
 
     /**
-     * Set the default filters
+     * Set the default filter
      *
      * @param Zend_Filter_Interface $filter
      *
      * @return void
      */
-    abstract public function setDefaultFilter(Zend_Filter_Interface $filter = null);
+    public function setDefaultFilter(Zend_Filter_Interface $filter)
+    {
+        $this->_defaultFilter = $filter;
+    }
+
+    /**
+     * Set the default filters
+     *
+     * @return void
+     */
+    abstract public function addDefaultFilters();
 }

tests/Zend/Markup/Test/Renderer/MockRenderer.php

@@ -47,12 +47,8 @@ class Zend_Markup_Test_Renderer_MockRenderer extends Zend_Markup_Renderer_Render
      *
      * @return void
      */
-    public function setDefaultFilter(Zend_Filter_Interface $filter = null)
+    public function addDefaultFilters()
     {
-        if (empty($filter)) {
-            $this->_defaultFilter = new Zend_Filter();
-        } else {
-            $this->_defaultFilter = $filter;
-        }
+        $this->_defaultFilter = new Zend_Filter();
     }
 }