From e1794bbb6682ca37cf52235fd0b2d3c8d62f7547 Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 27 Jun 2012 04:20:29 +0000 Subject: 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 --- admin/include/image.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); } -- cgit v1.2.3