From f8842f64ab7905d7ea007ea8e7fb0f64b43df2b8 Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Wed, 19 May 2010 11:51:32 -0400
Subject: [PATCH] clean up Horde_Image factory a bit

---
 framework/Image/lib/Horde/Image.php | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/framework/Image/lib/Horde/Image.php b/framework/Image/lib/Horde/Image.php
index 449606c2d..e1097ece8 100644
--- a/framework/Image/lib/Horde/Image.php
+++ b/framework/Image/lib/Horde/Image.php
@@ -211,7 +211,8 @@ class Horde_Image
      * @param array $params  A hash containing any additional configuration or
      *                       connection parameters a subclass might need.
      *
-     * @return mixed  Horde_Image object | PEAR_Error
+     * @return mixed  Horde_Image object
+     * @throws Horde_Image_Exception
      */
     static public function factory($driver, $params = array())
     {
@@ -221,14 +222,6 @@ class Horde_Image
 
         $driver = basename($driver);
         $class = 'Horde_Image_' . $driver;
-        if (!class_exists($class)) {
-            if (!empty($app)) {
-                include_once $GLOBALS['registry']->get('fileroot', $app) . '/lib/Image/' . $driver . '.php';
-            } else {
-                include_once 'Horde/Image/' . $driver . '.php';
-            }
-        }
-
         if (!empty($params['context']) && count($params['context'])) {
             $context = $params['context'];
             unset($params['context']);
@@ -236,12 +229,10 @@ class Horde_Image
             $context = array();
         }
         if (class_exists($class)) {
-            $image = new $class($params, $context);
+            return new $class($params, $context);
         } else {
-            $image = PEAR::raiseError('Class definition of ' . $class . ' not found.');
+            throw new Horde_Image_Exception('Invalid Image driver specified: ' . $class . ' not found.');
         }
-
-        return $image;
     }
 
     /**
-- 
2.11.0