X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=includes%2FLinker.php;h=049fb07284ab3114c3b63732a7f711a8b0437474;hb=12a9cf3110c9ea840b20f74b3d4a968c92d8b446;hp=d1434f8ff44f9ee89601499c980de06320ba6406;hpb=6e840bcfd4542a0873f8ec878472f71859009b4f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Linker.php b/includes/Linker.php
index d1434f8ff4..049fb07284 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -114,15 +114,20 @@ class Linker {
 		} else {
 			$text = $html; // null
 		}
+
 		if ( in_array( 'known', $options, true ) ) {
 			return $linkRenderer->makeKnownLink( $target, $text, $customAttribs, $query );
-		} elseif ( in_array( 'broken', $options, true ) ) {
+		}
+
+		if ( in_array( 'broken', $options, true ) ) {
 			return $linkRenderer->makeBrokenLink( $target, $text, $customAttribs, $query );
-		} elseif ( in_array( 'noclasses', $options, true ) ) {
+		}
+
+		if ( in_array( 'noclasses', $options, true ) ) {
 			return $linkRenderer->makePreloadedLink( $target, $text, '', $customAttribs, $query );
-		} else {
-			return $linkRenderer->makeLink( $target, $text, $customAttribs, $query );
 		}
+
+		return $linkRenderer->makeLink( $target, $text, $customAttribs, $query );
 	}
 
 	/**
@@ -193,9 +198,9 @@ class Linker {
 					getFormattedNsText( $namespace );
 			}
 			return $context->msg( 'invalidtitle-knownnamespace', $namespace, $name, $title )->text();
-		} else {
-			return $context->msg( 'invalidtitle-unknownnamespace', $namespace, $title )->text();
 		}
+
+		return $context->msg( 'invalidtitle-unknownnamespace', $namespace, $title )->text();
 	}
 
 	/**
@@ -207,14 +212,12 @@ class Linker {
 		if ( $target->getNamespace() == NS_SPECIAL && !$target->isExternal() ) {
 			list( $name, $subpage ) = MediaWikiServices::getInstance()->getSpecialPageFactory()->
 				resolveAlias( $target->getDBkey() );
-			if ( !$name ) {
-				return $target;
+			if ( $name ) {
+				return SpecialPage::getTitleValueFor( $name, $subpage, $target->getFragment() );
 			}
-			$ret = SpecialPage::getTitleValueFor( $name, $subpage, $target->getFragment() );
-			return $ret;
-		} else {
-			return $target;
 		}
+
+		return $target;
 	}
 
 	/**
@@ -259,7 +262,9 @@ class Linker {
 		return Html::element( 'img',
 			[
 				'src' => $url,
-				'alt' => $alt ] );
+				'alt' => $alt
+			]
+		);
 	}
 
 	/**
@@ -730,12 +735,15 @@ class Linker {
 
 		if ( $wgUploadMissingFileUrl ) {
 			return wfAppendQuery( $wgUploadMissingFileUrl, $q );
-		} elseif ( $wgUploadNavigationUrl ) {
+		}
+
+		if ( $wgUploadNavigationUrl ) {
 			return wfAppendQuery( $wgUploadNavigationUrl, $q );
-		} else {
-			$upload = SpecialPage::getTitleFor( 'Upload' );
-			return $upload->getLocalURL( $q );
 		}
+
+		$upload = SpecialPage::getTitleFor( 'Upload' );
+
+		return $upload->getLocalURL( $q );
 	}
 
 	/**
@@ -998,10 +1006,11 @@ class Linker {
 	public static function userTalkLink( $userId, $userText ) {
 		$userTalkPage = Title::makeTitle( NS_USER_TALK, $userText );
 		$moreLinkAttribs['class'] = 'mw-usertoollinks-talk';
-		$userTalkLink = self::link( $userTalkPage,
-						wfMessage( 'talkpagelinktext' )->escaped(),
-						$moreLinkAttribs );
-		return $userTalkLink;
+
+		return self::link( $userTalkPage,
+			wfMessage( 'talkpagelinktext' )->escaped(),
+			$moreLinkAttribs
+		);
 	}
 
 	/**
@@ -1013,10 +1022,11 @@ class Linker {
 	public static function blockLink( $userId, $userText ) {
 		$blockPage = SpecialPage::getTitleFor( 'Block', $userText );
 		$moreLinkAttribs['class'] = 'mw-usertoollinks-block';
-		$blockLink = self::link( $blockPage,
-					 wfMessage( 'blocklink' )->escaped(),
-					 $moreLinkAttribs );
-		return $blockLink;
+
+		return self::link( $blockPage,
+			wfMessage( 'blocklink' )->escaped(),
+			$moreLinkAttribs
+		);
 	}
 
 	/**
@@ -1027,10 +1037,10 @@ class Linker {
 	public static function emailLink( $userId, $userText ) {
 		$emailPage = SpecialPage::getTitleFor( 'Emailuser', $userText );
 		$moreLinkAttribs['class'] = 'mw-usertoollinks-mail';
-		$emailLink = self::link( $emailPage,
-					 wfMessage( 'emaillink' )->escaped(),
-					 $moreLinkAttribs );
-		return $emailLink;
+		return self::link( $emailPage,
+			wfMessage( 'emaillink' )->escaped(),
+			$moreLinkAttribs
+		);
 	}
 
 	/**
@@ -1107,9 +1117,7 @@ class Linker {
 
 		# Render autocomments and make links:
 		$comment = self::formatAutocomments( $comment, $title, $local, $wikiId );
-		$comment = self::formatLinksInComment( $comment, $title, $local, $wikiId );
-
-		return $comment;
+		return self::formatLinksInComment( $comment, $title, $local, $wikiId );
 	}
 
 	/**
@@ -1166,9 +1174,11 @@ class Linker {
 						$section = $auto;
 						# Remove links that a user may have manually put in the autosummary
 						# This could be improved by copying as much of Parser::stripSectionName as desired.
-						$section = str_replace( '[[:', '', $section );
-						$section = str_replace( '[[', '', $section );
-						$section = str_replace( ']]', '', $section );
+						$section = str_replace( [
+							'[[:',
+							'[[',
+							']]'
+						], '', $section );
 
 						// We don't want any links in the auto text to be linked, but we still
 						// want to show any [[ ]]
@@ -1679,12 +1689,10 @@ class Linker {
 			$fallbackAnchor = htmlspecialchars( $fallbackAnchor );
 			$fallback = "<span id=\"$fallbackAnchor\"></span>";
 		}
-		$ret = "<h$level$attribs"
+		return "<h$level$attribs"
 			. "$fallback<span class=\"mw-headline\" id=\"$anchorEscaped\">$html</span>"
 			. $link
 			. "</h$level>";
-
-		return $ret;
 	}
 
 	/**
@@ -1889,51 +1897,10 @@ class Linker {
 			}
 
 			return self::link( $title, $html, $attrs, $query, $options );
-		} else {
-			$html = $context->msg( 'rollbacklink' )->escaped();
-			return self::link( $title, $html, $attrs, $query, $options );
-		}
-	}
-
-	/**
-	 * @deprecated since 1.28, use TemplatesOnThisPageFormatter directly
-	 *
-	 * Returns HTML for the "templates used on this page" list.
-	 *
-	 * Make an HTML list of templates, and then add a "More..." link at
-	 * the bottom. If $more is null, do not add a "More..." link. If $more
-	 * is a Title, make a link to that title and use it. If $more is a string,
-	 * directly paste it in as the link (escaping needs to be done manually).
-	 * Finally, if $more is a Message, call toString().
-	 *
-	 * @since 1.16.3. $more added in 1.21
-	 * @param Title[] $templates Array of templates
-	 * @param bool $preview Whether this is for a preview
-	 * @param bool $section Whether this is for a section edit
-	 * @param Title|Message|string|null $more An escaped link for "More..." of the templates
-	 * @return string HTML output
-	 */
-	public static function formatTemplates( $templates, $preview = false,
-		$section = false, $more = null
-	) {
-		wfDeprecated( __METHOD__, '1.28' );
-
-		$type = false;
-		if ( $preview ) {
-			$type = 'preview';
-		} elseif ( $section ) {
-			$type = 'section';
 		}
 
-		if ( $more instanceof Message ) {
-			$more = $more->toString();
-		}
-
-		$formatter = new TemplatesOnThisPageFormatter(
-			RequestContext::getMain(),
-			MediaWikiServices::getInstance()->getLinkRenderer()
-		);
-		return $formatter->format( $templates, $type, $more );
+		$html = $context->msg( 'rollbacklink' )->escaped();
+		return self::link( $title, $html, $attrs, $query, $options );
 	}
 
 	/**
@@ -1963,23 +1930,6 @@ class Linker {
 		return $outText;
 	}
 
-	/**
-	 * @deprecated since 1.28, use Language::formatSize() directly
-	 *
-	 * Format a size in bytes for output, using an appropriate
-	 * unit (B, KB, MB or GB) according to the magnitude in question
-	 *
-	 * @since 1.16.3
-	 * @param int $size Size to format
-	 * @return string
-	 */
-	public static function formatSize( $size ) {
-		wfDeprecated( __METHOD__, '1.28' );
-
-		global $wgLang;
-		return htmlspecialchars( $wgLang->formatSize( $size ) );
-	}
-
 	/**
 	 * Given the id of an interface element, constructs the appropriate title
 	 * attribute from the system messages.  (Note, this is usually the id but