X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLinker.php;h=4b9b9630604b9862ebd8d34b9ffe19041e9550d5;hb=2c085ac5a3c8020958d52554e13317feef30ffaf;hp=892587526ff4ecfa83b1176993840fb8ce4c2948;hpb=85f9456b2d5ba36f9244982b9654da70c66d7d92;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Linker.php b/includes/Linker.php
index 892587526f..4b9b963060 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -346,7 +346,10 @@ class Linker {
 		} elseif ( in_array( 'known', $options ) ) {
 			$defaults['title'] = $target->getPrefixedText();
 		} else {
-			$defaults['title'] = wfMessage( 'red-link-title', $target->getPrefixedText() )->text();
+			// This ends up in parser cache!
+			$defaults['title'] = wfMessage( 'red-link-title', $target->getPrefixedText() )
+				->inContentLanguage()
+				->text();
 		}
 
 		# Finally, merge the custom attribs with the default ones, and iterate
@@ -670,17 +673,6 @@ class Linker {
 		return str_replace( "\n", ' ', $prefix . $s . $postfix );
 	}
 
-	/**
-	 * See makeImageLink()
-	 * When this function is removed, remove if( $parser instanceof Parser ) check there too
-	 * @deprecated since 1.20
-	 */
-	public static function makeImageLink2( Title $title, $file, $frameParams = array(),
-		$handlerParams = array(), $time = false, $query = "", $widthOption = null ) {
-		return self::makeImageLink( null, $title, $file, $frameParams,
-			$handlerParams, $time, $query, $widthOption );
-	}
-
 	/**
 	 * Get the link parameters for MediaTransformOutput::toHtml() from given
 	 * frame parameters supplied by the Parser.
@@ -2021,7 +2013,7 @@ class Linker {
 	 * directly paste it in as the link (escaping needs to be done manually).
 	 * Finally, if $more is a Message, call toString().
 	 *
-	 * @param array $templates Array of templates from Article::getUsedTemplate or similar
+	 * @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
@@ -2161,13 +2153,13 @@ class Linker {
 	 * @param string $name Id of the element, minus prefixes.
 	 * @param string|null $options Null or the string 'withaccess' to add an access-
 	 *   key hint
+	 * @param array $msgParams Parameters to pass to the message
+	 *
 	 * @return string Contents of the title attribute (which you must HTML-
 	 *   escape), or false for no title attribute
 	 */
-	public static function titleAttrib( $name, $options = null ) {
-
-		$message = wfMessage( "tooltip-$name" );
-
+	public static function titleAttrib( $name, $options = null, array $msgParams = array() ) {
+		$message = wfMessage( "tooltip-$name", $msgParams );
 		if ( !$message->exists() ) {
 			$tooltip = false;
 		} else {
@@ -2315,47 +2307,20 @@ class Linker {
 
 	/* Deprecated methods */
 
-	/**
-	 * @deprecated since 1.16 Use link(); warnings since 1.21
-	 *
-	 * Make a link for a title which may or may not be in the database. If you need to
-	 * call this lots of times, pre-fill the link cache with a LinkBatch, otherwise each
-	 * call to this will result in a DB query.
-	 *
-	 * @param Title $nt The title object to make the link from, e.g. from Title::newFromText.
-	 * @param string $text Link text
-	 * @param string $query Optional query part
-	 * @param string $trail Optional trail. Alphabetic characters at the start of this string will
-	 *   be included in the link text. Other characters will be appended after
-	 *   the end of the link.
-	 * @param string $prefix Optional prefix. As trail, only before instead of after.
-	 * @return string
-	 */
-	static function makeLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-		wfDeprecated( __METHOD__, '1.21' );
-
-		$query = wfCgiToArray( $query );
-		list( $inside, $trail ) = self::splitTrail( $trail );
-		if ( $text === '' ) {
-			$text = self::linkText( $nt );
-		}
-
-		$ret = self::link( $nt, "$prefix$text$inside", array(), $query ) . $trail;
-
-		return $ret;
-	}
-
 	/**
 	 * Returns the attributes for the tooltip and access key.
+	 *
 	 * @param string $name
+	 * @param array $msgParams Params for constructing the message
+	 *
 	 * @return array
 	 */
-	public static function tooltipAndAccesskeyAttribs( $name ) {
+	public static function tooltipAndAccesskeyAttribs( $name, array $msgParams = array() ) {
 		# @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
 		# no attribute" instead of "output '' as value for attribute", this
 		# would be three lines.
 		$attribs = array(
-			'title' => self::titleAttrib( $name, 'withaccess' ),
+			'title' => self::titleAttrib( $name, 'withaccess', $msgParams ),
 			'accesskey' => self::accesskey( $name )
 		);
 		if ( $attribs['title'] === false ) {