Removed original encoding arguments in the img and url tokenconverter.

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

library/Zend/Markup/Renderer/Html/Img.php

@@ -74,8 +74,8 @@ class Zend_Markup_Renderer_Html_Img extends Zend_Markup_Renderer_Html_HtmlAbstra
         }
 
         // run the URI and alt through htmlentities
-        $uri = htmlentities($uri, ENT_QUOTES, 'UTF-8', Zend_Markup_Renderer_Html::getEncoding());
-        $alt = htmlentities($alt, ENT_QUOTES, 'UTF-8', Zend_Markup_Renderer_Html::getEncoding());
+        $uri = htmlentities($uri, ENT_QUOTES, Zend_Markup_Renderer_Html::getEncoding());
+        $alt = htmlentities($alt, ENT_QUOTES, Zend_Markup_Renderer_Html::getEncoding());
 
 
         return "<img src=\"{$uri}\" alt=\"{$alt}\"" . Zend_Markup_Renderer_Html::renderAttributes($token) . " />";

library/Zend/Markup/Renderer/Html/Url.php

@@ -69,7 +69,7 @@ class Zend_Markup_Renderer_Html_Url extends Zend_Markup_Renderer_Html_HtmlAbstra
         $attributes = Zend_Markup_Renderer_Html::renderAttributes($token);
 
         // run the URI through htmlentities
-        $uri = htmlentities($uri, ENT_QUOTES, 'UTF-8');
+        $uri = htmlentities($uri, ENT_QUOTES, Zend_Markup_Renderer_Html::getEncoding());
 
         return "<a href=\"{$uri}\"{$attributes}>{$text}</a>";
     }