diff options
| author | patdenice <patdenice@piwigo.org> | 2011-11-07 15:35:34 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2011-11-07 15:35:34 +0000 |
| commit | 98f013725a56646ad535636753fd2bde1895a425 (patch) | |
| tree | 2da3e1029eb01f75b38d15691efe9c9afd5aa380 /admin/include | |
| parent | ff687492bbc9182362301de07f448ee4057fceee (diff) | |
merge r12581 from trunk to branch 2.3
bug:2496
Imagick library (class version) is not detected properly on some servers
git-svn-id: http://piwigo.org/svn/branches/2.3@12582 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
| -rw-r--r-- | admin/include/image.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 43eaaea4a..5586c021c 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -260,7 +260,7 @@ class pwg_image static function is_imagick() { - return extension_loaded('imagick'); + return (extension_loaded('imagick') and class_exists('Imagick')); } static function is_ext_imagick() |