X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fskins%2FSkin.php;h=b05fb0bcd9e0f172cba3ae6293b841110bbc01cf;hb=e548e0f35c4b47a0de4903e8a3758c2b2d9e2712;hp=72663ca3addd5452e1d2e88fa32c7c753b53d434;hpb=c340e8dc06ef219c4fab1d40f64c6c293e774da8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 72663ca3ad..b05fb0bcd9 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -449,7 +449,8 @@ abstract class Skin extends ContextSource {
 		if ( $title->isSpecialPage() ) {
 			$type = 'ns-special';
 			// T25315: provide a class based on the canonical special page name without subpages
-			list( $canonicalName ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
+			list( $canonicalName ) = MediaWikiServices::getInstance()->getSpecialPageFactory()->
+				resolveAlias( $title->getDBkey() );
 			if ( $canonicalName ) {
 				$type .= ' ' . Sanitizer::escapeClass( "mw-special-$canonicalName" );
 			} else {
@@ -532,7 +533,7 @@ abstract class Skin extends ContextSource {
 			$t = $embed . implode( "{$pop}{$embed}", $allCats['normal'] ) . $pop;
 
 			$msg = $this->msg( 'pagecategories' )->numParams( count( $allCats['normal'] ) )->escaped();
-			$linkPage = wfMessage( 'pagecategorieslink' )->inContentLanguage()->text();
+			$linkPage = $this->msg( 'pagecategorieslink' )->inContentLanguage()->text();
 			$title = Title::newFromText( $linkPage );
 			$link = $title ? Linker::link( $title, $msg ) : $msg;
 			$s .= '<div id="mw-normal-catlinks" class="mw-normal-catlinks">' .
@@ -1330,7 +1331,7 @@ abstract class Skin extends ContextSource {
 	 * @param string $message
 	 */
 	public function addToSidebar( &$bar, $message ) {
-		$this->addToSidebarPlain( $bar, wfMessage( $message )->inContentLanguage()->plain() );
+		$this->addToSidebarPlain( $bar, $this->msg( $message )->inContentLanguage()->plain() );
 	}
 
 	/**
@@ -1471,7 +1472,7 @@ abstract class Skin extends ContextSource {
 				$uTalkTitle,
 				$this->msg( 'newmessageslinkplural' )->params( $plural )->escaped(),
 				[],
-				[ 'redirect' => 'no' ]
+				$uTalkTitle->isRedirect() ? [ 'redirect' => 'no' ] : []
 			);
 
 			$newMessagesDiffLink = Linker::linkKnown(
@@ -1526,7 +1527,7 @@ abstract class Skin extends ContextSource {
 	 *   should fall back to the next notice in its sequence
 	 */
 	private function getCachedNotice( $name ) {
-		global $wgRenderHashAppend, $wgContLang;
+		global $wgRenderHashAppend;
 
 		$needParse = false;
 
@@ -1547,7 +1548,8 @@ abstract class Skin extends ContextSource {
 			$notice = $msg->plain();
 		}
 
-		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+		$services = MediaWikiServices::getInstance();
+		$cache = $services->getMainWANObjectCache();
 		$parsed = $cache->getWithSetCallback(
 			// Use the extra hash appender to let eg SSL variants separately cache
 			// Key is verified with md5 hash of unparsed wikitext
@@ -1559,12 +1561,13 @@ abstract class Skin extends ContextSource {
 			}
 		);
 
+		$contLang = $services->getContentLanguage();
 		return Html::rawElement(
 			'div',
 			[
 				'id' => 'localNotice',
-				'lang' => $wgContLang->getHtmlCode(),
-				'dir' => $wgContLang->getDir()
+				'lang' => $contLang->getHtmlCode(),
+				'dir' => $contLang->getDir()
 			],
 			$parsed
 		);
@@ -1618,13 +1621,13 @@ abstract class Skin extends ContextSource {
 
 		$attribs = [];
 		if ( !is_null( $tooltip ) ) {
-			$attribs['title'] = wfMessage( 'editsectionhint' )->rawParams( $tooltip )
+			$attribs['title'] = $this->msg( 'editsectionhint' )->rawParams( $tooltip )
 				->inLanguage( $lang )->text();
 		}
 
 		$links = [
 			'editsection' => [
-				'text' => wfMessage( 'editsection' )->inLanguage( $lang )->escaped(),
+				'text' => $this->msg( 'editsection' )->inLanguage( $lang )->escaped(),
 				'targetTitle' => $nt,
 				'attribs' => $attribs,
 				'query' => [ 'action' => 'edit', 'section' => $section ],
@@ -1649,7 +1652,7 @@ abstract class Skin extends ContextSource {
 
 		$result .= implode(
 			'<span class="mw-editsection-divider">'
-				. wfMessage( 'pipe-separator' )->inLanguage( $lang )->escaped()
+				. $this->msg( 'pipe-separator' )->inLanguage( $lang )->escaped()
 				. '</span>',
 			$linksHtml
 		);