Kohana v3.3.5

modules/image/classes/Kohana/Image.php

@@ -23,6 +23,7 @@ abstract class Kohana_Image {
 	const VERTICAL   = 0x12;
 
 	/**
+	 * @deprecated - provide an image.default_driver value in your configuration instead
 	 * @var  string  default driver: GD, ImageMagick, etc
 	 */
 	public static $default_driver = 'GD';
@@ -44,8 +45,9 @@ abstract class Kohana_Image {
 	{
 		if ($driver === NULL)
 		{
-			// Use the default driver
-			$driver = Image::$default_driver;
+			// Use the driver from configuration file or default one
+			$configured_driver = Kohana::$config->load('image.default_driver');
+			$driver = ($configured_driver) ? $configured_driver : Image::$default_driver;
 		}
 
 		// Set the class name

modules/image/classes/Kohana/Image/GD.php

@@ -611,6 +611,7 @@ class Kohana_Image_GD extends Image {
 		switch (strtolower($extension))
 		{
 			case 'jpg':
+			case 'jpe':
 			case 'jpeg':
 				// Save a JPG file
 				$save = 'imagejpeg';

modules/image/classes/Kohana/Image/Imagick.php

@@ -314,6 +314,7 @@ class Kohana_Image_Imagick extends Image {
 		switch ($format)
 		{
 			case 'jpg':
+			case 'jpe':
 			case 'jpeg':
 				$type = IMAGETYPE_JPEG;
 			break;