From b88a2e3731e8f8b494da63c095cc2622ed11f2a5 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sat, 8 May 2010 16:24:36 -0400
Subject: [PATCH] fix Horde::fullSrcImg to work correctly with Horde_Themes

---
 ansel/templates/view/image.inc | 4 ++--
 framework/Core/lib/Horde.php   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansel/templates/view/image.inc b/ansel/templates/view/image.inc
index fa33c5542..6b040f470 100644
--- a/ansel/templates/view/image.inc
+++ b/ansel/templates/view/image.inc
@@ -83,7 +83,7 @@ function arrowHandler(e)
         }
 ?>
     <div class="slideControls">
-     <?php echo Horde::fullSrcImg('loading.gif', array('dir' => Horde_Themes::img(null, 'horde'), 'attr' => 'class="imgloading"'));?>
+     <?php echo Horde::fullSrcImg(Horde_Themes::img('loading.gif', array('app' => 'horde')), array('attr' => 'class="imgloading"'));?>
      <?php
      if (empty($this->_params['hide_slideshow'])) {
          echo '<a style="display:none;" href="' . $this->_urls['slideshow'] . '" class="ssPlay" title="' . _("Start Slideshow") . '">' .
@@ -110,7 +110,7 @@ function arrowHandler(e)
      </div>
     </div>
     <div class="slideControls">
-     <?php echo Horde::fullSrcImg('loading.gif', array('dir' => Horde_Themes::img(null, 'horde'), 'attr' => 'class="imgloading"'));?>
+     <?php echo Horde::fullSrcImg(Horde_Themes::img('loading.gif', array('app' => 'horde')), array('attr' => 'class="imgloading"'));?>
      <?php
      if (empty($this->_params['hide_slideshow'])) {
          echo '<a style="display:none;" href="' . $this->_urls['slideshow'] . '" class="ssPlay" title="' . _("Start Slideshow") . '">' .
diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index c0acb7ccd..fa2f36aab 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1368,12 +1368,12 @@ HTML;
         }
 
         /* If no directory has been specified, get it from the registry. */
-        $dir = empty($options['dir'])
-            ? Horde_Themes::img()
-            : $options['dir'];
+        if (!($src instanceof Horde_Themes_Image) && ($src[0] != '/')) {
+            $src = Horde_Themes::img($src, $options);
+        }
 
         /* If we can send as data, no need to get the full path */
-        $src = self::base64ImgData($dir . '/' . $src);
+        $src = self::base64ImgData($src);
         if (substr($src, 0, 10) != 'data:image') {
             $src = self::url($src, true, -1);
         }
-- 
2.11.0