From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 16 Feb 2010 00:41:47 +0000 (-0700)
Subject: Fix Horde_Image usage in imp
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=0e862d364160b105b2c2d8c19d301f7ac853abaf;p=horde.git

Fix Horde_Image usage in imp
---

diff --git a/imp/lib/Mime/Viewer/Images.php b/imp/lib/Mime/Viewer/Images.php
index 04b29f37d..d12763bc4 100644
--- a/imp/lib/Mime/Viewer/Images.php
+++ b/imp/lib/Mime/Viewer/Images.php
@@ -250,7 +250,7 @@ EOD;
      */
     protected function _getHordeImageOb($load)
     {
-        if (!$GLOBALS['conf']['image']['driver']) {
+        if (empty($GLOBALS['conf']['image']['driver'])) {
             return false;
         }
         $img = null;
@@ -261,7 +261,7 @@ EOD;
                 $context['convert'] = $GLOBALS['conf']['image']['convert'];
                 $context['identify'] = $GLOBALS['conf']['image']['identify'];
             }
-            $img = Horde_Image::factory($GLOBALS['conf']['image']['driver']);
+            $img = Horde_Image::factory($GLOBALS['conf']['image']['driver'], array('context' => $context));
         } catch (Horde_Image_Exception $e) {
             return false;
         }