Changeset 12494

Timestamp:

Oct 19, 2011, 3:07:17 PM (13 years ago)

Author:

patdenice

Message:

merge r12493 from trunk to branch 2.3
bug:2479
External ImageMagick library is not properly detected

File:

• branches/2.3/admin/include/image.class.php (modified) (1 diff)

branches/2.3/admin/include/image.class.php

@@ -272 +272 @@
       return false;
     }
-    @exec($conf['ext_imagick_dir'].'convert -version', $returnarray, $returnvalue);
-    if (!$returnvalue and !empty($returnarray[0]) and preg_match('/ImageMagick/i', $returnarray[0]))
+    @exec($conf['ext_imagick_dir'].'convert -version', $returnarray);
+    if (is_array($returnarray) and !empty($returnarray[0]) and preg_match('/ImageMagick/i', $returnarray[0]))
     {
       return true;