archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r12493 from trunk to branch 2.3

Browse source 
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
This commit is contained in:
patdenice 2011-10-19 13:07:17 +00:00
parent b2da56ead7
commit 8a519ccea1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
admin/include/image.class.php
View file

@ -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;
}