From: Yuriy Shnitkovskiy <dominno@ukr.net>
Date: Wed, 18 Jan 2017 20:55:20 +0000 (+0200)
Subject: Replaced all deprecated Linker methods with proper ones in core(1)
X-Git-Tag: 1.31.0-rc.0~4262^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=55667f024df509a5be135a21a733ae4f0a55617a

Replaced all deprecated Linker methods with proper ones in core(1)

Change-Id: Ie3a718dc1eae1507f8829fcf419c64c6846d2cb6
---

diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index facf847892..31369b0187 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -632,11 +632,12 @@ class CategoryViewer extends ContextSource {
 	private function pagingLinks( $first, $last, $type = '' ) {
 		$prevLink = $this->msg( 'prev-page' )->text();
 
+		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
 		if ( $first != '' ) {
 			$prevQuery = $this->query;
 			$prevQuery["{$type}until"] = $first;
 			unset( $prevQuery["{$type}from"] );
-			$prevLink = Linker::linkKnown(
+			$prevLink = $linkRenderer->makeKnownLink(
 				$this->addFragmentToTitle( $this->title, $type ),
 				$prevLink,
 				[],
@@ -650,7 +651,7 @@ class CategoryViewer extends ContextSource {
 			$lastQuery = $this->query;
 			$lastQuery["{$type}from"] = $last;
 			unset( $lastQuery["{$type}until"] );
-			$nextLink = Linker::linkKnown(
+			$nextLink = $linkRenderer->makeKnownLink(
 				$this->addFragmentToTitle( $this->title, $type ),
 				$nextLink,
 				[],
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 05fa366eba..c337691ef1 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3581,6 +3581,7 @@ HTML
 	 */
 	public function getCancelLink() {
 		$cancelParams = [];
+		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
 		if ( !$this->isConflict && $this->oldid > 0 ) {
 			$cancelParams['oldid'] = $this->oldid;
 		} elseif ( $this->getContextTitle()->isRedirect() ) {
@@ -3588,9 +3589,9 @@ HTML
 		}
 		$attrs = [ 'id' => 'mw-editform-cancel' ];
 
-		return Linker::linkKnown(
+		return $linkRenderer->makeKnownLink(
 			$this->getContextTitle(),
-			$this->context->msg( 'cancel' )->parse(),
+			new HtmlArmor( $this->context->msg( 'cancel' )->parse() ),
 			Html::buttonAttributes( $attrs, [ 'mw-ui-quiet' ] ),
 			$cancelParams
 		);
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index f850152050..82af08140f 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -21,6 +21,7 @@
  * @author Rob Church <robchur@gmail.com>
  * @ingroup Media
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * File deletion user interface
@@ -301,9 +302,10 @@ class FileDeleteForm {
 
 			if ( $wgUser->isAllowed( 'editinterface' ) ) {
 				$title = wfMessage( 'filedelete-reason-dropdown' )->inContentLanguage()->getTitle();
-				$link = Linker::linkKnown(
+				$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+				$link = $linkRenderer->makeKnownLink(
 					$title,
-					wfMessage( 'filedelete-edit-reasonlist' )->escaped(),
+					wfMessage( 'filedelete-edit-reasonlist' )->text(),
 					[],
 					[ 'action' => 'edit' ]
 				);
diff --git a/includes/MWGrants.php b/includes/MWGrants.php
index 58efdc7278..c7c54fd503 100644
--- a/includes/MWGrants.php
+++ b/includes/MWGrants.php
@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * A collection of public static functions to deal with grants.
@@ -178,9 +179,10 @@ class MWGrants {
 	 * @return string (proto-relative) HTML link
 	 */
 	public static function getGrantsLink( $grant, $lang = null ) {
-		return \Linker::linkKnown(
+		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+		return $linkRenderer->makeKnownLink(
 			\SpecialPage::getTitleFor( 'Listgrants', false, $grant ),
-			htmlspecialchars( self::grantName( $grant, $lang ) )
+			self::grantName( $grant, $lang )
 		);
 	}
 
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 8fe128507a..b691eca007 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2515,9 +2515,10 @@ class OutputPage extends ContextSource {
 					$query['returntoquery'] = wfArrayToCgi( $returntoquery );
 				}
 			}
-			$loginLink = Linker::linkKnown(
+			$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+			$loginLink = $linkRenderer->makeKnownLink(
 				SpecialPage::getTitleFor( 'Userlogin' ),
-				$this->msg( 'loginreqlink' )->escaped(),
+				$this->msg( 'loginreqlink' )->text(),
 				[],
 				$query
 			);
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 89982a61e8..a5e9d77344 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -493,9 +493,9 @@ class Preferences {
 					} else {
 						$disableEmailPrefs = true;
 						$emailauthenticated = $context->msg( 'emailnotauthenticated' )->parse() . '<br />' .
-							Linker::linkKnown(
+							$linkRenderer->makeKnownLink(
 								SpecialPage::getTitleFor( 'Confirmemail' ),
-								$context->msg( 'emailconfirmlink' )->escaped()
+								$context->msg( 'emailconfirmlink' )->text()
 							) . '<br />';
 						$emailauthenticationclass = "mw-email-not-authenticated";
 					}
@@ -942,11 +942,12 @@ class Preferences {
 				'raw' => [ 'EditWatchlist', 'raw' ],
 				'clear' => [ 'EditWatchlist', 'clear' ],
 			];
+			$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
 			foreach ( $editWatchlistModes as $editWatchlistMode => $mode ) {
 				// Messages: prefs-editwatchlist-edit, prefs-editwatchlist-raw, prefs-editwatchlist-clear
-				$editWatchlistLinks[] = Linker::linkKnown(
+				$editWatchlistLinks[] = $linkRenderer->makeKnownLink(
 					SpecialPage::getTitleFor( $mode[0], $mode[1] ),
-					$context->msg( "prefs-editwatchlist-{$editWatchlistMode}" )->parse()
+					new HtmlArmor( $context->msg( "prefs-editwatchlist-{$editWatchlistMode}" )->parse() )
 				);
 			}
 
diff --git a/includes/ProtectionForm.php b/includes/ProtectionForm.php
index bcf4dda98a..71f4c415ab 100644
--- a/includes/ProtectionForm.php
+++ b/includes/ProtectionForm.php
@@ -22,6 +22,7 @@
  *
  * @file
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Handles the page protection UI and backend
@@ -554,9 +555,10 @@ class ProtectionForm {
 		$out .= Xml::closeElement( 'fieldset' );
 
 		if ( $user->isAllowed( 'editinterface' ) ) {
-			$link = Linker::linkKnown(
+			$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+			$link = $linkRenderer->makeKnownLink(
 				$context->msg( 'protect-dropdown' )->inContentLanguage()->getTitle(),
-				$context->msg( 'protect-edit-reasonlist' )->escaped(),
+				$context->msg( 'protect-edit-reasonlist' )->text(),
 				[],
 				[ 'action' => 'edit' ]
 			);
diff --git a/includes/RevisionList.php b/includes/RevisionList.php
index 052fd16fe2..53cf6998a8 100644
--- a/includes/RevisionList.php
+++ b/includes/RevisionList.php
@@ -363,13 +363,14 @@ class RevisionItem extends RevisionItemBase {
 	 * @return string
 	 */
 	protected function getRevisionLink() {
-		$date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
-			$this->revision->getTimestamp(), $this->list->getUser() ) );
+		$date = $this->list->getLanguage()->userTimeAndDate(
+			$this->revision->getTimestamp(), $this->list->getUser() );
 
 		if ( $this->isDeleted() && !$this->canViewContent() ) {
-			return $date;
+			return htmlspecialchars( $date );
 		}
-		return Linker::linkKnown(
+		$linkRenderer = $this->getLinkRenderer();
+		return $linkRenderer->makeKnownLink(
 			$this->list->title,
 			$date,
 			[],
@@ -391,9 +392,10 @@ class RevisionItem extends RevisionItemBase {
 		if ( $this->isDeleted() && !$this->canViewContent() ) {
 			return $this->context->msg( 'diff' )->escaped();
 		} else {
-			return Linker::linkKnown(
+			$linkRenderer = $this->getLinkRenderer();
+			return $linkRenderer->makeKnownLink(
 					$this->list->title,
-					$this->list->msg( 'diff' )->escaped(),
+					$this->list->msg( 'diff' )->text(),
 					[],
 					[
 						'diff' => $this->revision->getId(),