Changeset 12582

Timestamp:

Nov 7, 2011, 4:35:34 PM (12 years ago)

Author:

patdenice

Message:

merge r12581 from trunk to branch 2.3
bug:2496
Imagick library (class version) is not detected properly on some servers

File:

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

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

@@ -261 +261 @@
   static function is_imagick()
   {
-    return extension_loaded('imagick');
+    return (extension_loaded('imagick') and class_exists('Imagick'));
   }