Changeset 1842 for trunk/system/libraries/Image.php

Timestamp:

01/28/2008 10:02:04 AM (12 months ago)

Author:

Shadowhand

Message:

Quick changes:

• Updated Kohana::auto_load() to handle the new driver structure
  
• Switched driver loading format to handle new driver structure
  
• Fixed some formatting issues with Payment drivers (bad JB!)
  

Files:

• trunk/system/libraries/Image.php (modified) (1 diff)

trunk/system/libraries/Image.php

@@ -94 +94 @@
                 $this->config = (array) $config + Config::item('image');
 
-                try
-                {
-                        // Set driver name
-                        $driver = 'Image_'.ucfirst($this->config['driver']).'_Driver';
-
-                        // Manually load so that exceptions can be caught
-                        require_once Kohana::find_file('libraries/drivers', substr($driver, 0, -7), TRUE);
-                }
-                catch (Kohana_Exception $e)
-                {
+                // Set driver class name
+                $driver = 'Image_'.ucfirst($this->config['driver']).'_Driver';
+
+                // Load the driver
+                if ( ! Kohana::auto_load($driver))
                         throw new Kohana_Exception('image.driver_not_supported', $this->config['driver']);
-                }
 
                 // Initialize the driver