bug:2479

External ImageMagick library is not properly detected git-svn-id: http://piwigo.org/svn/trunk@12493 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Oct 19, 2011 · 5c452b8 · 5c452b8
1 parent 467b40f
commit 5c452b8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
@@ -271,8 +271,8 @@ static function is_ext_imagick()
     {
       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;
     }