X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=blobdiff_plain;f=includes%2FLinker.php;h=1a5058d6f4e88f7ac20f46529c3b2cec2312917e;hb=543c5c1a1f985f3107ad1172933770bb761e54cf;hp=47be8a27ea008903533a441a4e0122eb0a6ff4af;hpb=41355718e137b2ed88160ad5ddb4db50336d54d9;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Linker.php b/includes/Linker.php
index 47be8a27ea..1a5058d6f4 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -688,35 +688,38 @@ class Linker {
 		if ( $label == '' ) {
 			$label = $title->getPrefixedText();
 		}
-		$encLabel = htmlspecialchars( $label );
+		$repoGroup = MediaWikiServices::getInstance()->getRepoGroup();
 		$currentExists = $time
-			&& MediaWikiServices::getInstance()->getRepoGroup()->findFile( $title ) !== false;
+			&& $repoGroup->findFile( $title ) !== false;
 
 		if ( ( $wgUploadMissingFileUrl || $wgUploadNavigationUrl || $wgEnableUploads )
 			&& !$currentExists
 		) {
-			$redir = RepoGroup::singleton()->getLocalRepo()->checkRedirect( $title );
-
-			if ( $redir ) {
-				// We already know it's a redirect, so mark it
-				// accordingly
+			if ( $repoGroup->getLocalRepo()->checkRedirect( $title ) ) {
+				// We already know it's a redirect, so mark it accordingly
 				return self::link(
 					$title,
-					$encLabel,
+					htmlspecialchars( $label ),
 					[ 'class' => 'mw-redirect' ],
 					wfCgiToArray( $query ),
 					[ 'known', 'noclasses' ]
 				);
 			}
 
-			$href = self::getUploadUrl( $title, $query );
-
-			return '<a href="' . htmlspecialchars( $href ) . '" class="new" title="' .
-				htmlspecialchars( $title->getPrefixedText(), ENT_QUOTES ) . '">' .
-				$encLabel . '</a>';
+			return Html::element( 'a', [
+					'href' => self::getUploadUrl( $title, $query ),
+					'class' => 'new',
+					'title' => $title->getPrefixedText()
+				], $label );
 		}
 
-		return self::link( $title, $encLabel, [], wfCgiToArray( $query ), [ 'known', 'noclasses' ] );
+		return self::link(
+			$title,
+			htmlspecialchars( $label ),
+			[],
+			wfCgiToArray( $query ),
+			[ 'known', 'noclasses' ]
+		);
 	}
 
 	/**
@@ -1038,7 +1041,7 @@ class Linker {
 		}
 
 		$userTalkPage = new TitleValue( NS_USER_TALK, strtr( $userText, ' ', '_' ) );
-		$moreLinkAttribs['class'] = 'mw-usertoollinks-talk';
+		$moreLinkAttribs = [ 'class' => 'mw-usertoollinks-talk' ];
 
 		return self::link( $userTalkPage,
 			wfMessage( 'talkpagelinktext' )->escaped(),
@@ -1060,7 +1063,7 @@ class Linker {
 		}
 
 		$blockPage = SpecialPage::getTitleFor( 'Block', $userText );
-		$moreLinkAttribs['class'] = 'mw-usertoollinks-block';
+		$moreLinkAttribs = [ 'class' => 'mw-usertoollinks-block' ];
 
 		return self::link( $blockPage,
 			wfMessage( 'blocklink' )->escaped(),
@@ -1081,7 +1084,7 @@ class Linker {
 		}
 
 		$emailPage = SpecialPage::getTitleFor( 'Emailuser', $userText );
-		$moreLinkAttribs['class'] = 'mw-usertoollinks-mail';
+		$moreLinkAttribs = [ 'class' => 'mw-usertoollinks-mail' ];
 		return self::link( $emailPage,
 			wfMessage( 'emaillink' )->escaped(),
 			$moreLinkAttribs
@@ -1322,7 +1325,7 @@ class Linker {
 					$services->getNamespaceInfo()->getCanonicalName( NS_MEDIA ), '/' );
 				$medians .= '|';
 				$medians .= preg_quote(
-					MediaWikiServices::getInstance()->getContentLanguage()->getNsText( NS_MEDIA ),
+					$services->getContentLanguage()->getNsText( NS_MEDIA ),
 					'/'
 				) . '):';
 
@@ -1359,7 +1362,7 @@ class Linker {
 					}
 					if ( $match[1] !== false && $match[1] !== '' ) {
 						if ( preg_match(
-							MediaWikiServices::getInstance()->getContentLanguage()->linkTrail(),
+							$services->getContentLanguage()->linkTrail(),
 							$match[3],
 							$submatch
 						) ) {
@@ -1375,7 +1378,7 @@ class Linker {
 
 						Title::newFromText( $linkTarget );
 						try {
-							$target = MediaWikiServices::getInstance()->getTitleParser()->
+							$target = $services->getTitleParser()->
 								parseTitle( $linkTarget );
 
 							if ( $target->getText() == '' && !$target->isExternal()