From: Stephane Bisson <sbisson@wikimedia.org>
Date: Tue, 22 Aug 2017 13:03:42 +0000 (-0400)
Subject: WLFilters: avoid querying the DB when filters are in conflict
X-Git-Tag: 1.31.0-rc.0~2301^2
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=38a8438836d244fe6b38805a8ca973ba86c9aedc;p=lhc%2Fweb%2Fwiklou.git

WLFilters: avoid querying the DB when filters are in conflict

Bug: T171132
Change-Id: I53843471e3cffb892ca954338983e77a66a46dbb
---

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index b20b33117b..effd7745f5 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -415,6 +415,10 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 
 		$this->runMainQueryHook( $tables, $fields, $conds, $query_options, $join_conds, $opts );
 
+		if ( $this->areFiltersInConflict() ) {
+			return false;
+		}
+
 		return $dbr->select(
 			$tables,
 			$fields,