diff options
| author | patdenice <patdenice@piwigo.org> | 2011-10-19 13:07:17 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2011-10-19 13:07:17 +0000 |
| commit | 8a519ccea1f82936bdee119a8a87046193604c63 (patch) | |
| tree | e2337a8eabee0c34f8a552f6c8a866de14866510 /admin/include | |
| parent | b2da56ead789c0cfbadbd505991794820233e832 (diff) | |
merge r12493 from trunk to branch 2.3
bug:2479
External ImageMagick library is not properly detected
git-svn-id: http://piwigo.org/svn/branches/2.3@12494 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | admin/include/image.class.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 067cc9b08..43eaaea4a 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -271,8 +271,8 @@ class pwg_image { 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; } |