X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLinker.php;h=864019dcc709164fe5a05425f9e343db61cdb2a3;hb=e22efbce178309cb4dd537633b634bfc9e17d571;hp=03d251666779c69e0f5a6b1975cc36aa510bfebf;hpb=4858f8afdabb2a1d7c60b7c14b6f4d398056c07e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Linker.php b/includes/Linker.php
index 03d2516667..864019dcc7 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -21,7 +21,7 @@
  */
 use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
-use MediaWiki\Storage\RevisionRecord;
+use MediaWiki\Revision\RevisionRecord;
 
 /**
  * Some internal bits split of from Skin.php. These functions are used
@@ -688,13 +688,14 @@ class Linker {
 		if ( $label == '' ) {
 			$label = $title->getPrefixedText();
 		}
+		$repoGroup = MediaWikiServices::getInstance()->getRepoGroup();
 		$currentExists = $time
-			&& MediaWikiServices::getInstance()->getRepoGroup()->findFile( $title ) !== false;
+			&& $repoGroup->findFile( $title ) !== false;
 
 		if ( ( $wgUploadMissingFileUrl || $wgUploadNavigationUrl || $wgEnableUploads )
 			&& !$currentExists
 		) {
-			if ( RepoGroup::singleton()->getLocalRepo()->checkRedirect( $title ) ) {
+			if ( $repoGroup->getLocalRepo()->checkRedirect( $title ) ) {
 				// We already know it's a redirect, so mark it accordingly
 				return self::link(
 					$title,
@@ -890,7 +891,7 @@ class Linker {
 	 * Make user link (or user contributions for unregistered users)
 	 * @param int $userId User id in database.
 	 * @param string $userName User name in database.
-	 * @param string $altUserName Text to display instead of the user name (optional)
+	 * @param string|false $altUserName Text to display instead of the user name (optional)
 	 * @return string HTML fragment
 	 * @since 1.16.3. $altUserName was added in 1.19.
 	 */
@@ -1040,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(),
@@ -1062,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(),
@@ -1083,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
@@ -1911,7 +1912,7 @@ class Linker {
 	 * @since 1.16.3. $context added in 1.20. $editCount added in 1.21
 	 * @param Revision $rev
 	 * @param IContextSource|null $context Context to use or null for the main context.
-	 * @param int $editCount Number of edits that would be reverted
+	 * @param int|false $editCount Number of edits that would be reverted
 	 * @return string HTML fragment
 	 */
 	public static function buildRollbackLink( $rev, IContextSource $context = null,