Merge branch 'master' into talmdal

1 files changed, 6 insertions, 5 deletions

diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index c9557324..1b56ab97 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -60,14 +60,15 @@ class gallery_task_Core {
 
         $item = ORM::factory("item", $row->id);
         if ($item->loaded) {
-          $success = graphics::generate($item);
-          if (!$success) {
+          try {
+            graphics::generate($item);
             $ignored[$item->id] = 1;
-            $errors[] = t("Unable to rebuild images for '%title'",
-                          array("title" => html::purify($item->title)));
-          } else {
             $errors[] = t("Successfully rebuilt images for '%title'",
                           array("title" => html::purify($item->title)));
+          } catch (Exception $e) {
+            $errors[] = t("Unable to rebuild images for '%title'",
+                          array("title" => html::purify($item->title)));
+            $errors[] = $e->__toString();
           }
         }