From: Michael M Slusarz <slusarz@curecanti.org>
Date: Fri, 19 Feb 2010 18:22:47 +0000 (-0700)
Subject: Remove reference to non-existent global variable
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=cda524fe470d3e15da197bef2004b34ac73c58c0;p=horde.git

Remove reference to non-existent global variable
---

diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Html2text.php b/framework/Text_Filter/lib/Horde/Text/Filter/Html2text.php
index 46be64486..a548dd97a 100644
--- a/framework/Text_Filter/lib/Horde/Text/Filter/Html2text.php
+++ b/framework/Text_Filter/lib/Horde/Text/Filter/Html2text.php
@@ -36,7 +36,7 @@ class Horde_Text_Filter_Html2text extends Horde_Text_Filter_Base
      * @var array
      */
     protected $_params = array(
-        'charset' => null,
+        'charset' => 'ISO-8859-1',
         'width' => 70,
         'wrap' => true
     );
@@ -50,12 +50,7 @@ class Horde_Text_Filter_Html2text extends Horde_Text_Filter_Base
      */
     public function preProcess($text)
     {
-        if (is_null($this->_params['charset'])) {
-            $this->_params['charset'] = isset($GLOBALS['_HORDE_STRING_CHARSET']) ? $GLOBALS['_HORDE_STRING_CHARSET'] : 'ISO-8859-1';
-        }
-
         $this->_linkList = array();
-
         return trim($text);
     }
 
diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Text2html.php b/framework/Text_Filter/lib/Horde/Text/Filter/Text2html.php
index 37fb7606e..fc4fd2901 100644
--- a/framework/Text_Filter/lib/Horde/Text/Filter/Text2html.php
+++ b/framework/Text_Filter/lib/Horde/Text/Filter/Text2html.php
@@ -52,7 +52,7 @@ class Horde_Text_Filter_Text2html extends Horde_Text_Filter_Base
      */
     protected $_params = array(
         'callback' => 'Horde::externalUrl',
-        'charset' => null,
+        'charset' => 'ISO-8859-1',
         'class' => 'fixed',
         'nofollow' => false,
         'noprefetch' => false,
@@ -83,12 +83,6 @@ class Horde_Text_Filter_Text2html extends Horde_Text_Filter_Base
      */
     public function preProcess($text)
     {
-        if (is_null($this->_params['charset'])) {
-            $this->_params['charset'] = isset($GLOBALS['_HORDE_STRING_CHARSET'])
-                ? $GLOBALS['_HORDE_STRING_CHARSET']
-                : 'ISO-8859-1';
-        }
-
         /* Abort out on simple cases. */
         if ($this->_params['parselevel'] == self::PASSTHRU) {
             return $text;