X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialEditWatchlist.php;h=e1ecfe8cd516731cbe6a2f83e7736c62dcb36f29;hb=b1dfb00704a39474a7b69ecf464227502c7aa57c;hp=627dd2cfa9238695f9a6e40139a45f49a148bc69;hpb=44a4bdb691fa8765540560f68addf966a39438e8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 627dd2cfa9..e1ecfe8cd5 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -2,7 +2,6 @@
 /**
  * @defgroup Watchlist Users watchlist handling
  */
-use MediaWiki\Linker\LinkTarget;
 
 /**
  * Implements Special:EditWatchlist
@@ -27,6 +26,8 @@ use MediaWiki\Linker\LinkTarget;
  * @ingroup Watchlist
  */
 
+use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 
 /**
@@ -67,8 +68,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 */
 	private function initServices() {
 		if ( !$this->titleParser ) {
-			$lang = $this->getContext()->getLanguage();
-			$this->titleParser = new MediaWikiTitleCodec( $lang, GenderCache::singleton() );
+			$this->titleParser = MediaWikiServices::getInstance()->getTitleParser();
 		}
 	}
 
@@ -138,12 +138,17 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	protected function outputSubtitle() {
 		$out = $this->getOutput();
 		$out->addSubtitle( $this->msg( 'watchlistfor2', $this->getUser()->getName() )
-			->rawParams( SpecialEditWatchlist::buildTools( null ) ) );
+			->rawParams(
+				self::buildTools(
+					$this->getLanguage(),
+					$this->getLinkRenderer()
+				)
+			)
+		);
 	}
 
 	/**
 	 * Executes an edit mode for the watchlist view, from which you can manage your watchlist
-	 *
 	 */
 	protected function executeViewEditWatchlist() {
 		$out = $this->getOutput();
@@ -198,7 +203,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 			}
 		}
 
-		GenderCache::singleton()->doTitlesArray( $titles );
+		MediaWikiServices::getInstance()->getGenderCache()->doTitlesArray( $titles );
 
 		$list = [];
 		/** @var Title $title */
@@ -277,7 +282,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 * @param string $output
 	 */
 	private function showTitles( $titles, &$output ) {
-		$talk = $this->msg( 'talkpagelinktext' )->escaped();
+		$talk = $this->msg( 'talkpagelinktext' )->text();
 		// Do a batch existence check
 		$batch = new LinkBatch();
 		if ( count( $titles ) >= 100 ) {
@@ -300,6 +305,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 		// Print out the list
 		$output .= "<ul>\n";
 
+		$linkRenderer = $this->getLinkRenderer();
 		foreach ( $titles as $title ) {
 			if ( !$title instanceof Title ) {
 				$title = Title::newFromText( $title );
@@ -307,9 +313,9 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 
 			if ( $title instanceof Title ) {
 				$output .= '<li>' .
-					Linker::link( $title ) . ' ' .
+					$linkRenderer->makeLink( $title ) . ' ' .
 					$this->msg( 'parentheses' )->rawParams(
-						Linker::link( $title->getTalkPage(), $talk )
+						$linkRenderer->makeLink( $title->getTalkPage(), $talk )
 					)->escaped() .
 					"</li>\n";
 			}
@@ -347,7 +353,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 				}
 			}
 
-			GenderCache::singleton()->doTitlesArray( $titles );
+			MediaWikiServices::getInstance()->getGenderCache()->doTitlesArray( $titles );
 
 			foreach ( $titles as $title ) {
 				$list[] = $title->getPrefixedText();
@@ -423,20 +429,22 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 		}
 
 		$user = $this->getUser();
-		$store = MediaWikiServices::getInstance()->getWatchedItemStore();
-
-		foreach ( $this->badItems as $row ) {
-			list( $title, $namespace, $dbKey ) = $row;
-			$action = $title ? 'cleaning up' : 'deleting';
-			wfDebug( "User {$user->getName()} has broken watchlist item ns($namespace):$dbKey, $action.\n" );
-
-			$store->removeWatch( $user, new TitleValue( (int)$namespace, $dbKey ) );
-
-			// Can't just do an UPDATE instead of DELETE/INSERT due to unique index
-			if ( $title ) {
-				$user->addWatch( $title );
+		$badItems = $this->badItems;
+		DeferredUpdates::addCallableUpdate( function () use ( $user, $badItems ) {
+			$store = MediaWikiServices::getInstance()->getWatchedItemStore();
+			foreach ( $badItems as $row ) {
+				list( $title, $namespace, $dbKey ) = $row;
+				$action = $title ? 'cleaning up' : 'deleting';
+				wfDebug( "User {$user->getName()} has broken watchlist item " .
+					"ns($namespace):$dbKey, $action.\n" );
+
+				$store->removeWatch( $user, new TitleValue( (int)$namespace, $dbKey ) );
+				// Can't just do an UPDATE instead of DELETE/INSERT due to unique index
+				if ( $title ) {
+					$user->addWatch( $title );
+				}
 			}
-		}
+		} );
 	}
 
 	/**
@@ -610,26 +618,27 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 * @return string
 	 */
 	private function buildRemoveLine( $title ) {
-		$link = Linker::link( $title );
+		$linkRenderer = $this->getLinkRenderer();
+		$link = $linkRenderer->makeLink( $title );
 
-		$tools['talk'] = Linker::link(
+		$tools['talk'] = $linkRenderer->makeLink(
 			$title->getTalkPage(),
-			$this->msg( 'talkpagelinktext' )->escaped()
+			$this->msg( 'talkpagelinktext' )->text()
 		);
 
 		if ( $title->exists() ) {
-			$tools['history'] = Linker::linkKnown(
+			$tools['history'] = $linkRenderer->makeKnownLink(
 				$title,
-				$this->msg( 'history_short' )->escaped(),
+				$this->msg( 'history_small' )->text(),
 				[],
 				[ 'action' => 'history' ]
 			);
 		}
 
 		if ( $title->getNamespace() == NS_USER && !$title->isSubpage() ) {
-			$tools['contributions'] = Linker::linkKnown(
+			$tools['contributions'] = $linkRenderer->makeKnownLink(
 				SpecialPage::getTitleFor( 'Contributions', $title->getText() ),
-				$this->msg( 'contributions' )->escaped()
+				$this->msg( 'contributions' )->text()
 			);
 		}
 
@@ -724,11 +733,19 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 * Build a set of links for convenient navigation
 	 * between watchlist viewing and editing modes
 	 *
-	 * @param null $unused
+	 * @param Language $lang
+	 * @param LinkRenderer|null $linkRenderer
 	 * @return string
 	 */
-	public static function buildTools( $unused ) {
-		global $wgLang;
+	public static function buildTools( $lang, LinkRenderer $linkRenderer = null ) {
+		if ( !$lang instanceof Language ) {
+			// back-compat where the first parameter was $unused
+			global $wgLang;
+			$lang = $wgLang;
+		}
+		if ( !$linkRenderer ) {
+			$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+		}
 
 		$tools = [];
 		$modes = [
@@ -740,16 +757,16 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 
 		foreach ( $modes as $mode => $arr ) {
 			// can use messages 'watchlisttools-view', 'watchlisttools-edit', 'watchlisttools-raw'
-			$tools[] = Linker::linkKnown(
+			$tools[] = $linkRenderer->makeKnownLink(
 				SpecialPage::getTitleFor( $arr[0], $arr[1] ),
-				wfMessage( "watchlisttools-{$mode}" )->escaped()
+				wfMessage( "watchlisttools-{$mode}" )->text()
 			);
 		}
 
 		return Html::rawElement(
 			'span',
 			[ 'class' => 'mw-watchlist-toollinks' ],
-			wfMessage( 'parentheses' )->rawParams( $wgLang->pipeList( $tools ) )->escaped()
+			wfMessage( 'parentheses' )->rawParams( $lang->pipeList( $tools ) )->escaped()
 		);
 	}
 }
@@ -776,7 +793,7 @@ class EditWatchlistCheckboxSeriesField extends HTMLMultiSelectField {
 	 * HTMLMultiSelectField throws validation errors if we get input data
 	 * that doesn't match the data set in the form setup. This causes
 	 * problems if something gets removed from the watchlist while the
-	 * form is open (bug 32126), but we know that invalid items will
+	 * form is open (T34126), but we know that invalid items will
 	 * be harmless so we can override it here.
 	 *
 	 * @param string $value The value the field was submitted with