Changeset 16077 for branches/2.4/admin/include

Timestamp:

Jun 27, 2012, 6:20:29 AM (12 years ago)

Author:

rvelices

Message:

correctly log errors when external imagick fails (merge from trunk)

File:

• branches/2.4/admin/include/image.class.php (modified) (2 diffs)

branches/2.4/admin/include/image.class.php

@@ -623 +623 @@
 
     $dest = pathinfo($destination_filepath);
-    $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
+    $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'" 2>&1';
     @exec($exec, $returnarray);
 
@@ -630 +630 @@
     {
       ilog('ERROR', $returnarray);
+      foreach($returnarray as $line)
+        trigger_error($line, E_USER_WARNING);
     }
     return is_array($returnarray);