Sbisson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373064 )
Change subject: WLFilters: avoid querying the DB when filters are in conflict ...................................................................... WLFilters: avoid querying the DB when filters are in conflict Bug: T171132 Change-Id: I53843471e3cffb892ca954338983e77a66a46dbb --- M includes/specials/SpecialWatchlist.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/64/373064/1 diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index b20b331..effd774 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -415,6 +415,10 @@ $this->runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts ); + if ( $this->areFiltersInConflict() ) { + return false; + } + return $dbr->select( $tables, $fields, -- To view, visit https://gerrit.wikimedia.org/r/373064 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I53843471e3cffb892ca954338983e77a66a46dbb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Sbisson <sbis...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits