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

merge r16146 from trunk

Browse source 
check if ilog() exists before using it, allowing the use the class outer i.php

git-svn-id: http://piwigo.org/svn/branches/2.4@16147 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2012-06-28 18:47:34 +00:00
parent 457a627c29
commit de1166c7f2
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

@ -625,10 +625,10 @@ class image_ext_imagick implements imageInterface
$exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'" 2>&1';
@exec($exec, $returnarray);
ilog($exec);
if (function_exists('ilog')) ilog($exec);
if (is_array($returnarray) && (count($returnarray)>0) )
{
ilog('ERROR', $returnarray);
if (function_exists('ilog')) ilog('ERROR', $returnarray);
foreach($returnarray as $line)
trigger_error($line, E_USER_WARNING);
}