From 66df2096321ecf15bfb16914cb37271d69d3998f Mon Sep 17 00:00:00 2001
From: RushLana <renarde-dev@la-taniere-solidaire.fr>
Date: Fri, 16 May 2025 09:39:49 +0200
Subject: [PATCH] Change graphic library priority, ext_imagemick is now
 preffered

---
 admin/include/functions.php   | 16 ++++++++--------
 admin/include/image.class.php | 10 +++++-----
 admin/maintenance_actions.php | 22 +++++++++++-----------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 654ce4515..638629887 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -3726,6 +3726,14 @@ function get_graphics_library()
 
   switch (pwg_image::get_library())
   {
+    case 'ext_imagick':
+      exec($conf['ext_imagick_dir'].'convert -version', $returnarray);
+      if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match))
+      {
+        $library.= '/'.$match[1];
+      }
+      break;
+
     case 'imagick':
       $img = new Imagick();
       $version = $img->getVersion();
@@ -3735,14 +3743,6 @@ function get_graphics_library()
       }
       break;
 
-    case 'ext_imagick':
-      exec($conf['ext_imagick_dir'].'convert -version', $returnarray);
-      if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match))
-      {
-        $library.= '/'.$match[1];
-      }
-      break;
-
     case 'gd':
       $gd_info = gd_info();
       $library.= '/'.@$gd_info['GD Version'];
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
index 9ae2350cd..0b17ef5f1 100644
--- a/admin/include/image.class.php
+++ b/admin/include/image.class.php
@@ -406,16 +406,16 @@ class pwg_image
     switch (strtolower($library))
     {
       case 'auto':
-      case 'imagick':
-        if ($extension != 'gif' and self::is_imagick())
-        {
-          return 'imagick';
-        }
       case 'ext_imagick':
         if ($extension != 'gif' and self::is_ext_imagick())
         {
           return 'ext_imagick';
         }
+      case 'imagick':
+        if ($extension != 'gif' and self::is_imagick())
+        {
+          return 'imagick';
+        }
       case 'gd':
         if (self::is_gd())
         {
diff --git a/admin/maintenance_actions.php b/admin/maintenance_actions.php
index c001a2a1d..a15dba72f 100644
--- a/admin/maintenance_actions.php
+++ b/admin/maintenance_actions.php
@@ -318,17 +318,6 @@ $template->assign(
 // graphics library
 switch (pwg_image::get_library())
 {
-  case 'imagick':
-    $library = 'ImageMagick';
-    $img = new Imagick();
-    $version = $img->getVersion();
-    if (preg_match('/ImageMagick \d+\.\d+\.\d+-?\d*/', $version['versionString'], $match))
-    {
-      $library = $match[0];
-    }
-    $template->assign('GRAPHICS_LIBRARY', $library);
-    break;
-
   case 'ext_imagick':
     $library = 'External ImageMagick';
     exec($conf['ext_imagick_dir'].'convert -version', $returnarray);
@@ -339,6 +328,17 @@ switch (pwg_image::get_library())
     $template->assign('GRAPHICS_LIBRARY', $library);
     break;
 
+  case 'imagick':
+    $library = 'ImageMagick';
+    $img = new Imagick();
+    $version = $img->getVersion();
+    if (preg_match('/ImageMagick \d+\.\d+\.\d+-?\d*/', $version['versionString'], $match))
+    {
+      $library = $match[0];
+    }
+    $template->assign('GRAPHICS_LIBRARY', $library);
+    break;
+    
   case 'gd':
     $gd_info = gd_info();
     $template->assign('GRAPHICS_LIBRARY', 'GD '.@$gd_info['GD Version']);