diff options
author | rvelices <rv-github@modusoptimus.com> | 2012-06-27 04:19:38 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2012-06-27 04:19:38 +0000 |
commit | 9d42cbed3d90659be34d9e6f8c3c8e68e2cf9686 (patch) | |
tree | 3e65ea63317472b9bc7547232743c0157d8e9f86 | |
parent | 0bbca1dcbf4eabe61acee147875332b144b42e58 (diff) |
correctly log errors when external imagick fails
git-svn-id: http://piwigo.org/svn/trunk@16076 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | admin/include/image.class.php | 4 |
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); } |