Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 9 insertions, 2 deletions

diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index 4aa95f33..645850d1 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -84,8 +84,15 @@ class task_Core {
       }
       $task->save();
     } catch (Exception $e) {
-      Kohana_Log::add("error", $e->__toString());
-      $task->log($e->__toString());
+      Kohana_Log::add("error", (string)$e);
+
+      // Ugh.  I hate to use instanceof, But this beats catching the exception separately since
+      // we mostly want to treat it the same way as all other exceptions
+      if ($e instanceof ORM_Validation_Exception) {
+        Kohana_Log::add("error", "Validation errors: " . print_r($e->validation->errors(), 1));
+      }
+
+      $task->log((string)$e);
       $task->state = "error";
       $task->done = true;
       $task->status = substr($e->getMessage(), 0, 255);