X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=blobdiff_plain;f=includes%2FLinker.php;h=1a5058d6f4e88f7ac20f46529c3b2cec2312917e;hb=d4e0dbcf96d2a9cdff4a73f56d33beb5c25aa442;hp=a79ec3a8f12b08eb8301135b0eadc77c05f3d6b8;hpb=c1e9d63dfd68dcc1343840eaa8a395234ccba104;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Linker.php b/includes/Linker.php
index a79ec3a8f1..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