aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2012-06-28 18:47:34 +0000
committermistic100 <mistic@piwigo.org>2012-06-28 18:47:34 +0000
commitde1166c7f22104d8e22294f44060484e688632bf (patch)
treeac07125a1762086b53373ad6518e55880610c3d9 /admin
parent457a627c2943a20090082962e14aff7a3f78fe56 (diff)
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
Diffstat (limited to 'admin')
-rw-r--r--admin/include/image.class.php4
1 files changed, 2 insertions, 2 deletions
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);
}