Fix the remaining sidebar icon issues.

diff --git a/horde/services/portal/sidebar.php b/horde/services/portal/sidebar.php
index d61bfa9..a1d034c 100644 (file)
--- a/horde/services/portal/sidebar.php
+++ b/horde/services/portal/sidebar.php
@@ -124,12 +124,12 @@ function buildMenu()
             foreach ($list as $method => $vals) {
                 $name = Horde::stripAccessKey($vals['name']);
                 $icon = isset($vals['icon'])
-                    ? (string)Horde_Themes::img($vals['icon'])
-                    : (string)$registry->get('icon');
+                    ? Horde_Themes::img($vals['icon'])
+                    : $registry->get('icon');
 
                 $menu['administration_' . $method] = array(
                     'name' => $name,
-                    'icon' => $icon,
+                    'icon' => (string)$icon,
                     'status' => 'active',
                     'menu_parent' => 'administration',
                     'url' => Horde::url($registry->applicationWebPath($vals['link'])),
@@ -255,7 +255,7 @@ foreach ($menu as $app => $params) {
 
         $node_params = array('url' => $url,
                              'target' => isset($params['target']) ? $params['target'] : null,
-                             'icon' => isset($params['icon']) ? (string)$params['icon'] : (string)$registry->get('icon', $app),
+                             'icon' => (string)(isset($params['icon']) ? $params['icon'] : $registry->get('icon', $app)),
                              'icondir' => '',
                              );
         $tree->addNode($app, !empty($params['menu_parent']) ? $params['menu_parent'] : null, $name, 0, false, $node_params);

diff --git a/imp/lib/Block/tree_folders.php b/imp/lib/Block/tree_folders.php
index 1c1555a..bee7a48 100644 (file)
--- a/imp/lib/Block/tree_folders.php
+++ b/imp/lib/Block/tree_folders.php
@@ -72,7 +72,7 @@ class Horde_Block_imp_tree_folders extends Horde_Block
 
             $node_params = array(
                 'icon' => $val['icon'],
-                'icondir' => $val['icondir'],
+                'icondir' => (string)$val['icondir'],
                 'iconopen' => $val['iconopen'],
                 'url' => ($val['container']) ? null : $name_url->add('mailbox', $val['value']),
             );
@@ -95,7 +95,7 @@ class Horde_Block_imp_tree_folders extends Horde_Block
             }
 
             $node_params = array('url' => $url,
-                                 'icon' => $GLOBALS['registry']->get('icon', $parent),
+                                 'icon' => (string)$GLOBALS['registry']->get('icon', $parent),
                                  'icondir' => '');
             $menu_parent = $GLOBALS['registry']->get('menu_parent', $parent);
             $name = $GLOBALS['registry']->get('name', $parent);

diff --git a/kronolith/lib/Block/tree_alarms.php b/kronolith/lib/Block/tree_alarms.php
index 39088d2..fc34cff 100644 (file)
--- a/kronolith/lib/Block/tree_alarms.php
+++ b/kronolith/lib/Block/tree_alarms.php
@@ -48,7 +48,7 @@ class Horde_Block_kronolith_tree_alarms extends Horde_Block {
             $purl = Horde::url($GLOBALS['registry']->getInitialPage($parent));
         }
         $pnode_params = array('url' => $purl,
-                              'icon' => $GLOBALS['registry']->get('icon', $parent),
+                              'icon' => (string)$GLOBALS['registry']->get('icon', $parent),
                               'icondir' => '');
         $pnode_name = $GLOBALS['registry']->get('name', $parent);
         if ($alarmCount) {

diff --git a/nag/lib/Block/tree_alarms.php b/nag/lib/Block/tree_alarms.php
index 3fa9629..1ef6e42 100644 (file)
--- a/nag/lib/Block/tree_alarms.php
+++ b/nag/lib/Block/tree_alarms.php
@@ -57,11 +57,11 @@ class Horde_Block_nag_tree_alarms extends Horde_Block {
             $purl = Horde::url($GLOBALS['registry']->getInitialPage($parent));
         }
         $pnode_params = array('url' => $purl,
-                              'icon' => $GLOBALS['registry']->get('icon', $parent),
+                              'icon' => (string)$GLOBALS['registry']->get('icon', $parent),
                               'icondir' => '');
 
         $pnode_params = array('url' => $purl,
-                              'icon' => $GLOBALS['registry']->get('icon', $parent),
+                              'icon' => (string)$GLOBALS['registry']->get('icon', $parent),
                               'icondir' => '');
         $pnode_name = $GLOBALS['registry']->get('name', $parent);
         if ($alarmCount) {