jenkins-bot has submitted this change and it was merged.

Change subject: Bypass query length limit for incategory search
......................................................................


Bypass query length limit for incategory search

Bug: T107947
Change-Id: Id9df1c95211a9c5cd63e2cff9b77f609fe6e0a7c
---
M includes/Searcher.php
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Deskana: Looks good to me, but someone else must approve
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  Tjones: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Searcher.php b/includes/Searcher.php
index 8e9dd7c..0acb2c1 100644
--- a/includes/Searcher.php
+++ b/includes/Searcher.php
@@ -1987,7 +1987,11 @@
         */
        private function checkTextSearchRequestLength( $search ) {
                $requestLength = mb_strlen( $search );
-               if ( $requestLength > self::MAX_TEXT_SEARCH ) {
+               if (
+                       $requestLength > self::MAX_TEXT_SEARCH &&
+                       // allow category intersections longer than the maximum
+                       !preg_match( '/^incategory:[^ ]+$/', $search )
+               ) {
                        return Status::newFatal( 'cirrussearch-query-too-long', 
$this->language->formatNum( $requestLength ), $this->language->formatNum( 
self::MAX_TEXT_SEARCH ) );
                }
                return Status::newGood();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9df1c95211a9c5cd63e2cff9b77f609fe6e0a7c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: Deskana <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: Tjones <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to