aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-06-27 04:20:29 +0000
committerrvelices <rv-github@modusoptimus.com>2012-06-27 04:20:29 +0000
commite1794bbb6682ca37cf52235fd0b2d3c8d62f7547 (patch)
treede9836d8f9b372fdb691f41cff89544d0357d4a6 /admin/include
parent9f809077e0b9151a32b5a38a9240a1fb5ee68901 (diff)
correctly log errors when external imagick fails (merge from trunk)
git-svn-id: http://piwigo.org/svn/branches/2.4@16077 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/image.class.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
index 8aa55b307..60911b39f 100644
--- a/admin/include/image.class.php
+++ b/admin/include/image.class.php
@@ -622,13 +622,15 @@ class image_ext_imagick implements imageInterface
}
$dest = pathinfo($destination_filepath);
- $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
+ $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'" 2>&1';
@exec($exec, $returnarray);
ilog($exec);
if (is_array($returnarray) && (count($returnarray)>0) )
{
ilog('ERROR', $returnarray);
+ foreach($returnarray as $line)
+ trigger_error($line, E_USER_WARNING);
}
return is_array($returnarray);
}