|
@@ -386,7 +386,7 @@ discard block |
|
|
block discarded – undo |
|
386
|
386
|
// so we can't bail out early |
|
387
|
387
|
$rawCount += $results->count(); |
|
388
|
388
|
// now bolt on filtrate to accumulating result set if we haven't accumulated enough bitz |
|
389
|
|
- if ($rawTop > $resultSet->count() + $skip) { |
|
|
389
|
+ if ($rawTop > $resultSet->count()+$skip) { |
|
390
|
390
|
$resultSet = collect(array_merge($resultSet->all(), $results->all())); |
|
391
|
391
|
$sliceAmount = min($skip, $resultSet->count()); |
|
392
|
392
|
$resultSet = $resultSet->slice($sliceAmount); |
|
@@ -461,7 +461,7 @@ discard block |
|
|
block discarded – undo |
|
461
|
461
|
if (QueryType::COUNT() == $qVal || QueryType::ENTITIES_WITH_COUNT() == $qVal) { |
|
462
|
462
|
$result->count = $resultCount; |
|
463
|
463
|
} |
|
464
|
|
- $hazMore = $bulkSetCount > $skip + count($resultSet); |
|
|
464
|
+ $hazMore = $bulkSetCount > $skip+count($resultSet); |
|
465
|
465
|
$result->hasMore = $hazMore; |
|
466
|
466
|
} |
|
467
|
467
|
} |
Please login to merge, or discard this patch.