ZF-9420: Fixed the constructor options for the HTML renderer.

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

library/Zend/Markup/Renderer/Html.php

@@ -101,7 +101,12 @@ class Zend_Markup_Renderer_Html extends Zend_Markup_Renderer_RendererAbstract
             'Zend_Markup_Renderer_Html' => 'Zend/Markup/Renderer/Html/'
         ));
 
-        $this->_defineDefaultMarkups();
+        if (!isset($options['useDefaultMarkups']) && isset($options['useDefaultTags'])) {
+            $options['useDefaultMarkups'] = $options['useDefaultTags'];
+        }
+        if (isset($options['useDefaultMarkups']) && ($options['useDefaultMarkups'] !== false)) {
+            $this->_defineDefaultMarkups();
+        }
 
         parent::__construct($options);
     }

library/Zend/Markup/Renderer/RendererAbstract.php

@@ -131,9 +131,6 @@ abstract class Zend_Markup_Renderer_RendererAbstract
         if (isset($options['parser'])) {
             $this->setParser($options['parser']);
         }
-        if (isset($options['useDefaultTags']) && ($options['useDefaultTags'] === false)) {
-            $this->removeDefaultTags();
-        }
         if (!isset($options['useDefaultFilters']) || ($options['useDefaultFilters'] === true)) {
             $this->addDefaultFilters();
         }
@@ -179,13 +176,11 @@ abstract class Zend_Markup_Renderer_RendererAbstract
      *
      * @param string $encoding
      *
-     * @return Zend_Markup_Renderer_RendererAbstract
+     * @return void
      */
     public static function setEncoding($encoding)
     {
         self::$_encoding = $encoding;
-
-        return $this;
     }
 
     /**
@@ -557,7 +552,7 @@ abstract class Zend_Markup_Renderer_RendererAbstract
     public function getDefaultFilter()
     {
         if (null === $this->_defaultFilter) {
-            $this->setDefaultFilter();
+            $this->addDefaultFilters();
         }
 
         return $this->_defaultFilter;