summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/helpers/gallery_task.php8
-rw-r--r--modules/gallery/helpers/task.php4
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 5402b5d1..c75e050a 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -81,7 +81,7 @@ class gallery_task_Core {
} catch (Exception $e) {
$errors[] = t("Unable to rebuild images for '%title'",
array("title" => html::purify($item->title)));
- $errors[] = $e->__toString();
+ $errors[] = (string)$e;
$ignored[$item->id] = 1;
}
}
@@ -114,7 +114,7 @@ class gallery_task_Core {
$task->done = true;
$task->state = "error";
$task->status = $e->getMessage();
- $errors[] = $e->__toString();
+ $errors[] = (string)$e;
}
if ($errors) {
$task->log($errors);
@@ -217,7 +217,7 @@ class gallery_task_Core {
$task->done = true;
$task->state = "error";
$task->status = $e->getMessage();
- $errors[] = $e->__toString();
+ $errors[] = (string)$e;
}
if ($errors) {
$task->log($errors);
@@ -284,7 +284,7 @@ class gallery_task_Core {
$task->done = true;
$task->state = "error";
$task->status = $e->getMessage();
- $errors[] = $e->__toString();
+ $errors[] = (string)$e;
}
if ($errors) {
$task->log($errors);
diff --git a/modules/gallery/helpers/task.php b/modules/gallery/helpers/task.php
index ad756ecd..645850d1 100644
--- a/modules/gallery/helpers/task.php
+++ b/modules/gallery/helpers/task.php
@@ -84,7 +84,7 @@ class task_Core {
}
$task->save();
} catch (Exception $e) {
- Kohana_Log::add("error", $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
@@ -92,7 +92,7 @@ class task_Core {
Kohana_Log::add("error", "Validation errors: " . print_r($e->validation->errors(), 1));
}
- $task->log($e->__toString());
+ $task->log((string)$e);
$task->state = "error";
$task->done = true;
$task->status = substr($e->getMessage(), 0, 255);