From a96642d3db2e2910d3ad0c3d6224e4d214a4c224 Mon Sep 17 00:00:00 2001
From: Ben Klang <ben@alkaloid.net>
Date: Tue, 4 May 2010 10:35:55 -0400
Subject: [PATCH] Jonah: Two more Horde_Themes conversions

---
 jonah/lib/Block/tree_menu.php     | 2 +-
 jonah/templates/common-header.inc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jonah/lib/Block/tree_menu.php b/jonah/lib/Block/tree_menu.php
index 83cd8ce2e..59f782bfc 100644
--- a/jonah/lib/Block/tree_menu.php
+++ b/jonah/lib/Block/tree_menu.php
@@ -20,7 +20,7 @@ class Horde_Block_jonah_tree_menu extends Horde_Block {
         }
 
         $url = Horde::applicationUrl('stories/');
-        $icondir = $GLOBALS['registry']->getImageDir();
+        $icondir = Horde_Themes::img(null, array('notheme' => true, 'nohorde' => true));
         $news = Jonah_News::factory();
         $channels = $news->getChannels('internal');
         if (is_a($channels, 'PEAR_Error')) {
diff --git a/jonah/templates/common-header.inc b/jonah/templates/common-header.inc
index 8fb225dee..1777eeaa0 100644
--- a/jonah/templates/common-header.inc
+++ b/jonah/templates/common-header.inc
@@ -29,8 +29,8 @@ if ($channel_id = Horde_Util::getFormData('channel_id')) {
 }
 ?>
 <title><?php echo htmlspecialchars($page_title) ?></title>
-<link href="<?php echo $GLOBALS['registry']->getImageDir()?>/favicon.ico" rel="SHORTCUT ICON" />
-<?php Horde::includeStylesheetFiles() ?>
+<link href="<?php echo Horde_Themes::img(null, array('notheme' => true, 'nohorde' => true));?>/favicon.ico" rel="SHORTCUT ICON" />
+<?php Horde_Themes::includeStylesheetFiles() ?>
 </head>
 
 <body<?php if ($bc = Horde_Util::nonInputVar('bodyClass')) echo ' class="' . $bc . '"' ?><?php if ($bi = Horde_Util::nonInputVar('bodyId')) echo ' id="' . $bi . '"'; ?>>
-- 
2.11.0