Hermes: Horde_Block fixes for H4

diff --git a/hermes/lib/Block/tree_menu.php b/hermes/lib/Block/tree_menu.php
index fbb31d4..cbfc207 100644 (file)
--- a/hermes/lib/Block/tree_menu.php
+++ b/hermes/lib/Block/tree_menu.php
@@ -12,15 +12,12 @@ class Horde_Block_hermes_tree_menu extends Horde_Block {
 
     function _buildTree(&$tree, $indent = 0, $parent = null)
     {
-        require_once dirname(__FILE__) . '/../base.php';
-
         $tree->addNode($parent . '__add',
                        $parent,
                        _("Enter Time"),
                        $indent + 1,
                        false,
                        array('icon' => 'hermes.png',
-                             'icondir' => $GLOBALS['registry']->getImageDir(),
                              'url' => Horde::applicationUrl('entry.php')));
         $tree->addNode($parent . '__search',
                        $parent,
@@ -28,7 +25,6 @@ class Horde_Block_hermes_tree_menu extends Horde_Block {
                        $indent + 1,
                        false,
                        array('icon' => 'search.png',
-                             'icondir' => $GLOBALS['registry']->getImageDir('horde'),
                              'url' => Horde::applicationUrl('search.php')));
     }
 

diff --git a/hermes/lib/Block/tree_stopwatch.php b/hermes/lib/Block/tree_stopwatch.php
index 87d393e..dc95099 100644 (file)
--- a/hermes/lib/Block/tree_stopwatch.php
+++ b/hermes/lib/Block/tree_stopwatch.php
@@ -14,12 +14,9 @@ class Horde_Block_hermes_tree_stopwatch extends Horde_Block {
     {
         global $registry, $prefs;
 
-        require_once dirname(__FILE__) . '/../base.php';
-
         Horde::addScriptFile('popup.js', 'horde', true);
 
         $entry = Horde::applicationUrl('entry.php');
-        $icondir = $registry->getImageDir();
 
         $tree->addNode($parent . '__start',
                        $parent,
@@ -27,7 +24,6 @@ class Horde_Block_hermes_tree_stopwatch extends Horde_Block {
                        $indent + 1,
                        false,
                        array('icon' => 'timer-start.png',
-                             'icondir' => $icondir,
                              'url' => '#',
                              'onclick' => "popup('" . Horde::applicationUrl('start.php') . "', 400, 100); return false;"));
 
@@ -42,7 +38,6 @@ class Horde_Block_hermes_tree_stopwatch extends Horde_Block {
                                $indent + 1,
                                false,
                                array('icon' => 'timer-stop.png',
-                                     'icondir' => $icondir,
                                      'url' => Horde_Util::addParameter($entry, 'timer', $i),
                                      'target' => 'horde_main'));
             }