From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Wed, 13 Dec 2017 19:29:55 +0000 (-0800)
Subject: Follow-up Ib933de3a3f: remove unnecessary override from SpecialWatchlist
X-Git-Tag: 1.31.0-rc.0~1211^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=b59206179f51c80235ebcf707db506f46d9d466a;p=lhc%2Fweb%2Fwiklou.git

Follow-up Ib933de3a3f: remove unnecessary override from SpecialWatchlist

isStructuredFilterUiEnabledByDefault() should no longer be overridden,
overrides should be put in the static checkStructuredFilterUiEnabled()
instead. That function was already added, but the duplicated non-static
function wasn't removed.

It looks to me that ?rcfilters=1 shouldn't have been working on
Watchlist for this reason, but it was working, and I can't figure out
why.

Change-Id: Iaf962b4e0428e262b57dc12ee0ba2cb6f854eb7e
---

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index e8e828df08..2ad70a67a8 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -117,11 +117,6 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		);
 	}
 
-	public function isStructuredFilterUiEnabledByDefault() {
-		return $this->getConfig()->get( 'StructuredChangeFiltersOnWatchlist' ) &&
-			$this->getUser()->getDefaultOption( 'rcenhancedfilters' );
-	}
-
 	/**
 	 * Return an array of subpages that this special page will accept.
 	 *