Remove unneeded code.

diff --git a/imp/lib/DIMP.php b/imp/lib/DIMP.php
index 364bbeb..43ef02c 100644 (file)
--- a/imp/lib/DIMP.php
+++ b/imp/lib/DIMP.php
@@ -13,11 +13,6 @@
 class DIMP
 {
     /**
-     * Charset cache.
-     */
-    static protected $_charset;
-
-    /**
      * Output a dimp-style action (menubar) link.
      *
      * @param array $params  A list of parameters.
@@ -37,11 +32,8 @@ class DIMP
         $tooltip = (empty($params['tooltip'])) ? '' : $params['tooltip'];
 
         if (empty($params['title'])) {
-            if (!isset(self::$_charset)) {
-                self::$_charset = NLS::getCharset();
-            }
             $old_error = error_reporting(0);
-            $tooltip = nl2br(htmlspecialchars($tooltip, ENT_QUOTES, self::$_charset));
+            $tooltip = nl2br(htmlspecialchars($tooltip, ENT_QUOTES, NLS::getCharset()));
             $title = $ak = '';
         } else {
             $title = $params['title'];

diff --git a/imp/templates/index/index-dimp.inc b/imp/templates/index/index-dimp.inc
index 070dbe1..74d259e 100644 (file)
--- a/imp/templates/index/index-dimp.inc
+++ b/imp/templates/index/index-dimp.inc
@@ -3,10 +3,8 @@
 $hordeimg = $registry->getImageDir('horde');
 
 $usetrash = $prefs->getValue('use_trash');
-$menu_view = $prefs->getValue('menu_view');
-$show_text = ($menu_view == 'text' || $menu_view == 'both');
+$show_text = in_array($prefs->getValue('menu_view'), array('both', 'text'));
 $loading_text = _("Loading...");
-$is_ie6 = ($browser->isBrowser('msie') && ($browser->getMajor() < 7));
 
 $has_blacklist = $registry->hasMethod('mail/blacklistFrom');
 $has_whitelist = $registry->hasMethod('mail/whitelistFrom');