X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialWatchlist.php;h=2ad70a67a83353947b105561271bdd45a936689b;hb=0bbe51d765939354e487f5c6c9fcf38fc7cba6e8;hp=6eec8449a93800dff87615da5afb4bc320b9e558;hpb=394b04a0b208ee0f196ad73520c7cf6ed726b557;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 6eec8449a9..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.
 	 *
@@ -857,11 +852,12 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		return Html::rawElement(
 			'span',
 			$attribs,
-			Xml::checkLabel(
-				$this->msg( $message, '' )->text(),
-				$name,
-				$name,
-				(int)$value
+			// not using Html::checkLabel because that would escape the contents
+			Html::check( $name, (int)$value, [ 'id' => $name ] ) . Html::rawElement(
+				'label',
+				$attribs + [ 'for' => $name ],
+				// <nowiki/> at beginning to avoid messages with "$1 ..." being parsed as pre tags
+				$this->msg( $message, '<nowiki/>' )->parse()
 			)
 		);
 	}