Mailing List Archive

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/405757 )

Change subject: Use getSize since SearchSuggestionSet does not implement Countable
......................................................................


Use getSize since SearchSuggestionSet does not implement Countable

Bug: T184934
Change-Id: I39459352399e2023149b715b049084826df22935
---
M includes/search/SearchEngine.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
Tjones: Looks good to me, approved
jenkins-bot: Verified



diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 4253193..7ac24c5 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -543,7 +543,7 @@
$this->setLimitOffset( $fallbackLimit );
$fallbackSearchResult = $this->completionSearch( $fbs );
$results->appendAll( $fallbackSearchResult );
- $fallbackLimit -= count( $fallbackSearchResult );
+ $fallbackLimit -= $fallbackSearchResult->getSize();
if ( $fallbackLimit <= 0 ) {
break;
}

--
To view, visit https://gerrit.wikimedia.org/r/405757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I39459352399e2023149b715b049084826df22935
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <smalyshev@wikimedia.org>
Gerrit-Reviewer: DCausse <dcausse@wikimedia.org>
Gerrit-Reviewer: EBernhardson <ebernhardson@wikimedia.org>
Gerrit-Reviewer: Tjones <tjones@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits