X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fspecials%2FSpecialWatchlist.php;h=ba3cb87ecf25ca28fad18fd6ce0b5f96e2bfb5ec;hp=07889b7a9da7bbb1b68081248ca6f545607803fa;hb=c65120906674e6fbc540946428d26d32c0acd25b;hpb=467fbef034601ed172cbc643a633c18e5f69a2b6

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 07889b7a9d..ba3cb87ecf 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -104,6 +104,10 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 				'wgStructuredChangeFiltersSavedQueriesPreferenceName',
 				'rcfilters-wl-saved-queries'
 			);
+			$output->addJsConfigVars(
+				'wgStructuredChangeFiltersEditWatchlistUrl',
+				SpecialPage::getTitleFor( 'EditWatchlist' )->getLocalURL()
+			);
 		}
 	}
 
@@ -829,21 +833,29 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		$showUpdatedMarker = $this->getConfig()->get( 'ShowUpdatedMarker' );
 
 		// Show watchlist header
-		$form .= "<p>";
+		$watchlistHeader = '';
 		if ( $numItems == 0 ) {
-			$form .= $this->msg( 'nowatchlist' )->parse() . "\n";
+			$watchlistHeader = $this->msg( 'nowatchlist' )->parse();
 		} else {
-			$form .= $this->msg( 'watchlist-details' )->numParams( $numItems )->parse() . "\n";
+			$watchlistHeader .= $this->msg( 'watchlist-details' )->numParams( $numItems )->parse() . "\n";
 			if ( $this->getConfig()->get( 'EnotifWatchlist' )
 				&& $user->getOption( 'enotifwatchlistpages' )
 			) {
-				$form .= $this->msg( 'wlheader-enotif' )->parse() . "\n";
+				$watchlistHeader .= $this->msg( 'wlheader-enotif' )->parse() . "\n";
 			}
 			if ( $showUpdatedMarker ) {
-				$form .= $this->msg( 'wlheader-showupdated' )->parse() . "\n";
+				$watchlistHeader .= $this->msg(
+					$this->isStructuredFilterUiEnabled() ?
+						'rcfilters-watchlist-showupdated' :
+						'wlheader-showupdated'
+				)->parse() . "\n";
 			}
 		}
-		$form .= "</p>";
+		$form .= Html::rawElement(
+			'div',
+			[ 'class' => 'watchlistDetails' ],
+			$watchlistHeader
+		);
 
 		if ( $numItems > 0 && $showUpdatedMarker ) {
 			$form .= Xml::openElement( 'form', [ 'method' => 'post',