aboutsummaryrefslogtreecommitdiff
path: root/engine/classes
diff options
context:
space:
mode:
Diffstat (limited to 'engine/classes')
-rw-r--r--engine/classes/ElggBatch.php17
1 files changed, 11 insertions, 6 deletions
diff --git a/engine/classes/ElggBatch.php b/engine/classes/ElggBatch.php
index 34520f2bc..83963ccee 100644
--- a/engine/classes/ElggBatch.php
+++ b/engine/classes/ElggBatch.php
@@ -291,14 +291,19 @@ class ElggBatch
$this->incompleteEntities = array();
$this->results = call_user_func_array($this->getter, array($options));
- if ($this->incompleteEntities) {
- // @todo what to do here?
- }
- if ($this->results) {
+ // If there were incomplete entities, we pretend they were at the beginning of the results,
+ // fool the local counter to think it's skipped by them already, and update the running
+ // total as if the results contained the incompletes.
+ if ($this->results || $this->incompleteEntities) {
$this->chunkIndex++;
- $this->resultIndex = 0;
- $this->retrievedResults += count($this->results);
+ $this->resultIndex = count($this->incompleteEntities);
+ $this->retrievedResults += (count($this->results) + count($this->incompleteEntities));
+ if (!$this->results) {
+ // This fetch was *all* incompletes! We need to fetch until we can either
+ // offer at least one row to iterate over, or give up.
+ return $this->getNextResultsChunk();
+ }
return true;
} else {
return false;