diff options
author | Bharat Mediratta <bharat@menalto.com> | 2009-08-27 16:11:47 -0700 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2009-08-27 16:11:47 -0700 |
commit | 74363ced870d4114e7570729636875e0258917b3 (patch) | |
tree | 61bc27831a362994fc96ea90172d50e25d5c76cb /modules/gallery/helpers/task.php | |
parent | 98e9a96ba4d2419e02717369be8c0d886bc35ef7 (diff) | |
parent | 4828db003f3ee505eb9e6d056cdb142da34b78ff (diff) |
Merge branch 'master' of git@github.com:gallery/gallery3 into HEAD
Conflicts:
modules/slideshow/helpers/slideshow_event.php
Diffstat (limited to 'modules/gallery/helpers/task.php')
-rw-r--r-- | modules/gallery/helpers/task.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php index 6a9f63c2..9fa04305 100644 --- a/modules/gallery/helpers/task.php +++ b/modules/gallery/helpers/task.php @@ -84,10 +84,11 @@ class task_Core { } $task->save(); } catch (Exception $e) { + Kohana::log("error", $e->__toString()); $task->log($e->__toString()); $task->state = "error"; $task->done = true; - $task->status = $e->getMessage(); + $task->status = substr($e->getMessage(), 0, 255); $task->save(); } |