From de1166c7f22104d8e22294f44060484e688632bf Mon Sep 17 00:00:00 2001 From: mistic100 Date: Thu, 28 Jun 2012 18:47:34 +0000 Subject: merge r16146 from trunk 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 --- admin/include/image.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'admin') diff --git a/admin/include/image.class.php b/admin/include/image.class.php index 60911b39f..4eeceeb51 100644 --- a/admin/include/image.class.php +++ b/admin/include/image.class.php @@ -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); } -- cgit v1.2.3