jenkins-bot has submitted this change and it was merged.
Change subject: Gracefully handle empty pagination result
......................................................................
Gracefully handle empty pagination result
Pagination was mistakenly interpreting an empty result
set as result set containing a single null value.
Bug: 61349
Change-Id: Ia8afd0457baec1527ad8a7de3a656aa3b9b3d312
(cherry picked from commit 1257483033083ded06e3a82f02df3984df679fa6)
---
M includes/Data/Pager.php
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/Pager.php b/includes/Data/Pager.php
index fd229c8..2616af5 100644
--- a/includes/Data/Pager.php
+++ b/includes/Data/Pager.php
@@ -36,8 +36,11 @@
// Retrieve results
$results = $this->storage->find( $this->query, $options );
-
- return $this->processPage( $direction, $offset, $pageLimit,
$results );
+ if ( $results === null ) {
+ return new PagerPage( array(), array(), $this );
+ } else {
+ return $this->processPage( $direction, $offset,
$pageLimit, $results );
+ }
}
public function getDefaultLimit() {
--
To view, visit https://gerrit.wikimedia.org/r/114052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8afd0457baec1527ad8a7de3a656aa3b9b3d312
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.23wmf14
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
