summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-10-02 17:04:37 -0700
committerBharat Mediratta <bharat@menalto.com>2010-10-02 17:04:37 -0700
commita153ca082971e1eb454aa66199ee0380a9794a6e (patch)
tree2e3d4e3b7d037f42981baa0d0704e44e8531b9e6
parent161bbb9ba3fbc10cada28e4ce384a426cabc02d8 (diff)
Detect the case where there are no more broken images and skip to the end. Fixes #1414.
-rw-r--r--modules/gallery/helpers/gallery_task.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/modules/gallery/helpers/gallery_task.php b/modules/gallery/helpers/gallery_task.php
index 3b173928..d56edabb 100644
--- a/modules/gallery/helpers/gallery_task.php
+++ b/modules/gallery/helpers/gallery_task.php
@@ -84,6 +84,13 @@ class gallery_task_Core {
$ignored = $task->get("ignored", array());
$i = 0;
+
+ // If there's no work left to do, skip to the end. This can happen if we resume a task long
+ // after the work got done in some other task.
+ if (!$result->count()) {
+ $completed = $total_count;
+ }
+
foreach ($result as $row) {
if (array_key_exists($row->id, $ignored)) {
continue;