Merge pull request #1403 from Marc-pi/develop

fix typo in image driver lib calling for gmagik, reverse driver order
pi-engine · Apr 1, 2016 · cab82fa · cab82fa
2 parents e2f0e4a + 6a5fa3d
commit cab82fa
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/Pi/Application/Service/Image.php b/lib/Pi/Application/Service/Image.php
@@ -215,17 +215,17 @@ public function getDriver($driver = '')
                     break;
                 case 'imagick':
                     if (class_exists('Imagick')) {
-                        $driverClass = 'Imagine\Gmagick\Imagine';
+                        $driverClass = 'Imagine\Imagick\Imagine';
                     }
                     break;
                 case 'auto':
                 default:
-                    if (function_exists('gd_info')) {
-                        $driverClass = 'Imagine\Gd\Imagine';
-                    } elseif (class_exists('Gmagick')) {
+                    if (class_exists('Gmagick')) {
                         $driverClass = 'Imagine\Gmagick\Imagine';
                     } elseif (class_exists('Imagick')) {
-                        $driverClass = 'Imagine\Gmagick\Imagine';
+                        $driverClass = 'Imagine\Imagick\Imagine';
+                    } elseif (function_exists('gd_info')) {
+                        $driverClass = 'Imagine\Gd\Imagine';
                     }
                     break;
             }