From 7a85d89d830b74cb282fa7c8d59bf63d715a5ad9 Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Wed, 9 Jun 2010 18:30:13 -0400
Subject: [PATCH] Hermes: two more places to remove $registry->getImageDir()

---
 hermes/deliverables.php | 2 +-
 hermes/lib/Table.php    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/hermes/deliverables.php b/hermes/deliverables.php
index 2f2369f4d..5a2e8488c 100644
--- a/hermes/deliverables.php
+++ b/hermes/deliverables.php
@@ -100,7 +100,7 @@ if ($vars->exists('deliverable_id') || $vars->exists('new')) {
 
         $newdeliv = '&nbsp;' . Horde::link(Horde_Util::addParameter(Horde::applicationUrl('deliverables.php'), array('new' => 1, 'parent' => $deliverable['id'], 'client_id' => $vars->get('client_id'))), _("New Sub-deliverable")) . Horde::img('newdeliverable.png', _("New Sub-deliverable")) . '</a>';
 
-        $deldeliv = '&nbsp;' . Horde::link(Horde_Util::addParameter(Horde::applicationUrl('deliverables.php'), array('formname' => 'deletedeliverable', 'delete' => $deliverable['id'], 'client_id' => $vars->get('client_id'))), _("Delete This Deliverable")) . Horde::img('delete.png', _("Delete This Deliverable"), '', $registry->getImageDir('horde')) . '</a>';
+        $deldeliv = '&nbsp;' . Horde::link(Horde_Util::addParameter(Horde::applicationUrl('deliverables.php'), array('formname' => 'deletedeliverable', 'delete' => $deliverable['id'], 'client_id' => $vars->get('client_id'))), _("Delete This Deliverable")) . Horde::img('delete.png', _("Delete This Deliverable"), '') . '</a>';
 
         /* Calculate the node's depth. */
         $depth = 0;
diff --git a/hermes/lib/Table.php b/hermes/lib/Table.php
index e9abea1f4..7286290f9 100644
--- a/hermes/lib/Table.php
+++ b/hermes/lib/Table.php
@@ -151,8 +151,7 @@ class Horde_Ui_Table extends Horde_Ui_Widget {
         $exportlink = Horde_Util::addParameter($exportlink, array('id' => $id));
 
         $html .= ' &nbsp;' . Horde::link($exportlink, _("Export Data")) .
-                 Horde::img('data.png', _("Export Data"), 'hspace="2"',
-                            $GLOBALS['registry']->getImageDir('horde')) .
+                 Horde::img('data.png', _("Export Data"), 'hspace="2"') .
                  '</a>';
         */
 
-- 
2.11.0