X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLinker.php;h=2e33bd199cfabdc7522a024c67bceb881ca3eb66;hb=12f7ff32fcd46e8be4e336f5d92171f05f6abf26;hp=d6a4056f02622e37009970e4058bbb89d71ddfe7;hpb=55bc0a7a421f5f9ea99061189b6d851987cd54b2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Linker.php b/includes/Linker.php
index d6a4056f02..2e33bd199c 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1274,20 +1274,25 @@ class Linker {
 	 * temporarily to a value pass. Should be adjusted further. --brion
 	 *
 	 * @param string $comment
-	 * @param Title|null $title Title object (to generate link to the section in autocomment) or null
+	 * @param Title|null $title Title object (to generate link to the section in autocomment)
+	 *  or null
 	 * @param bool $local Whether section links should refer to local page
+	 * @param string|null $wikiId Id (as used by WikiMap) of the wiki to generate links to.
+	 *  For use with external changes.
+	 *
 	 * @return mixed|string
 	 */
-	public static function formatComment( $comment, $title = null, $local = false ) {
-
+	public static function formatComment(
+		$comment, $title = null, $local = false, $wikiId = null
+	) {
 		# Sanitize text a bit:
 		$comment = str_replace( "\n", " ", $comment );
 		# Allow HTML entities (for bug 13815)
 		$comment = Sanitizer::escapeHtmlAllowEntities( $comment );
 
 		# Render autocomments and make links:
-		$comment = self::formatAutocomments( $comment, $title, $local );
-		$comment = self::formatLinksInComment( $comment, $title, $local );
+		$comment = self::formatAutocomments( $comment, $title, $local, $wikiId );
+		$comment = self::formatLinksInComment( $comment, $title, $local, $wikiId );
 
 		return $comment;
 	}
@@ -1304,9 +1309,14 @@ class Linker {
 	 * @param string $comment Comment text
 	 * @param Title|null $title An optional title object used to links to sections
 	 * @param bool $local Whether section links should refer to local page
-	 * @return string Formatted comment
+	 * @param string|null $wikiId Id of the wiki to link to (if not the local wiki),
+	 *  as used by WikiMap.
+	 *
+	 * @return string Formatted comment (wikitext)
 	 */
-	private static function formatAutocomments( $comment, $title = null, $local = false ) {
+	private static function formatAutocomments(
+		$comment, $title = null, $local = false, $wikiId = null
+	) {
 		// @todo $append here is something of a hack to preserve the status
 		// quo. Someone who knows more about bidi and such should decide
 		// (1) what sane rendering even *is* for an LTR edit summary on an RTL
@@ -1320,7 +1330,7 @@ class Linker {
 			// zero-width assertions optional, so wrap them in a non-capturing
 			// group.
 			'!(?:(?<=(.)))?/\*\s*(.*?)\s*\*/(?:(?=(.)))?!',
-			function ( $match ) use ( $title, $local, &$append ) {
+			function ( $match ) use ( $title, $local, $wikiId, &$append ) {
 				global $wgLang;
 
 				// Ensure all match positions are defined
@@ -1330,7 +1340,12 @@ class Linker {
 				$auto = $match[2];
 				$post = $match[3] !== '';
 				$comment = null;
-				Hooks::run( 'FormatAutocomments', array( &$comment, $pre, $auto, $post, $title, $local ) );
+
+				Hooks::run(
+					'FormatAutocomments',
+					array( &$comment, $pre, $auto, $post, $title, $local, $wikiId )
+				);
+
 				if ( $comment === null ) {
 					$link = '';
 					if ( $title ) {
@@ -1349,9 +1364,7 @@ class Linker {
 								$title->getDBkey(), $section );
 						}
 						if ( $sectionTitle ) {
-							$link = Linker::link( $sectionTitle,
-								$wgLang->getArrow(), array(), array(),
-								'noclasses' );
+							$link = Linker::makeCommentLink( $sectionTitle, $wgLang->getArrow(), $wikiId, 'noclasses' );
 						} else {
 							$link = '';
 						}
@@ -1384,7 +1397,8 @@ class Linker {
 	 * @param string $comment Text to format links in
 	 * @param Title|null $title An optional title object used to links to sections
 	 * @param bool $local Whether section links should refer to local page
-	 * @param string|null $wikiId Id of the wiki to link to (if not the local wiki), as used by WikiMap
+	 * @param string|null $wikiId Id of the wiki to link to (if not the local wiki),
+	 *  as used by WikiMap.
 	 *
 	 * @return string
 	 */
@@ -1459,22 +1473,9 @@ class Linker {
 							$newTarget = clone ( $title );
 							$newTarget->setFragment( '#' . $target->getFragment() );
 							$target = $newTarget;
-
-						}
-
-						if ( $wikiId !== null ) {
-							$thelink = Linker::makeExternalLink(
-								WikiMap::getForeignURL( $wikiId, $target->getFullText() ),
-								$linkText . $inside,
-								/* escape = */ false // Already escaped
-							) . $trail;
-						} else {
-							$thelink = Linker::link(
-								$target,
-								$linkText . $inside
-							) . $trail;
 						}
 
+						$thelink = Linker::makeCommentLink( $target, $linkText . $inside, $wikiId ) . $trail;
 					}
 				}
 				if ( $thelink ) {
@@ -1493,6 +1494,39 @@ class Linker {
 		);
 	}
 
+	/**
+	 * Generates a link to the given Title
+	 *
+	 * @note This is only public for technical reasons. It's not intended for use outside Linker.
+	 *
+	 * @param Title $title
+	 * @param string $text
+	 * @param string|null $wikiId Id of the wiki to link to (if not the local wiki),
+	 *  as used by WikiMap.
+	 * @param string|string[] $options See the $options parameter in Linker::link.
+	 *
+	 * @return string HTML link
+	 */
+	public static function makeCommentLink(
+		Title $title, $text, $wikiId = null, $options = array()
+	) {
+		if ( $wikiId !== null && !$title->isExternal() ) {
+			$link = Linker::makeExternalLink(
+				WikiMap::getForeignURL(
+					$wikiId,
+					$title->getPrefixedText(),
+					$title->getFragment()
+				),
+				$text,
+				/* escape = */ false // Already escaped
+			);
+		} else {
+			$link = Linker::link( $title, $text, array(), array(), $options );
+		}
+
+		return $link;
+	}
+
 	/**
 	 * @param Title $contextTitle
 	 * @param string $target
@@ -1579,17 +1613,21 @@ class Linker {
 	 * @param string $comment
 	 * @param Title|null $title Title object (to generate link to section in autocomment) or null
 	 * @param bool $local Whether section links should refer to local page
+	 * @param string|null $wikiId Id (as used by WikiMap) of the wiki to generate links to.
+	 *  For use with external changes.
 	 *
 	 * @return string
 	 */
-	public static function commentBlock( $comment, $title = null, $local = false ) {
+	public static function commentBlock(
+		$comment, $title = null, $local = false, $wikiId = null
+	) {
 		// '*' used to be the comment inserted by the software way back
 		// in antiquity in case none was provided, here for backwards
 		// compatibility, acc. to brion -ævar
 		if ( $comment == '' || $comment == '*' ) {
 			return '';
 		} else {
-			$formatted = self::formatComment( $comment, $title, $local );
+			$formatted = self::formatComment( $comment, $title, $local, $wikiId );
 			$formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
 			return " <span class=\"comment\">$formatted</span>";
 		}
@@ -2382,6 +2420,7 @@ class Linker {
 			'title' => $tooltip
 		) );
 	}
+
 }
 
 /**