From 7ba628bf78d365bf74265ed83b37fc046432c468 Mon Sep 17 00:00:00 2001
From: "Mark A. Hershberger" <mah@users.mediawiki.org>
Date: Fri, 5 Nov 2010 19:06:12 +0000
Subject: [PATCH] Resolves Bug#542 by removing the link title from in-wiki
 links where the title just duplicates the link text.

---
 includes/Linker.php | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/includes/Linker.php b/includes/Linker.php
index 8d1bf34b95..92765b847f 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -198,7 +198,7 @@ class Linker {
 
 		$attribs = array_merge(
 			$attribs,
-			$this->linkAttribs( $target, $customAttribs, $options )
+			$this->linkAttribs( $target, $customAttribs, $options, $text )
 		);
 		if ( is_null( $text ) ) {
 			$text = $this->linkText( $target );
@@ -248,7 +248,7 @@ class Linker {
 	/**
 	 * Returns the array of attributes used when linking to the Title $target
 	 */
-	private function linkAttribs( $target, $attribs, $options ) {
+	private function linkAttribs( $target, $attribs, $options, $linkText ) {
 		wfProfileIn( __METHOD__ );
 		global $wgUser;
 		$defaults = array();
@@ -279,12 +279,13 @@ class Linker {
 		}
 
 		# Get a default title attribute.
+		$known = in_array( 'known', $options );
 		if ( $target->getPrefixedText() == '' ) {
 			# A link like [[#Foo]].  This used to mean an empty title
 			# attribute, but that's silly.  Just don't output a title.
-		} elseif ( in_array( 'known', $options ) ) {
+		} elseif ( $known && strtolower($linkText) !== strtolower($target->getPrefixedText() ) ) {
 			$defaults['title'] = $target->getPrefixedText();
-		} else {
+		} elseif ( !$known ) {
 			$defaults['title'] = wfMsg( 'red-link-title', $target->getPrefixedText() );
 		}
 
@@ -312,7 +313,7 @@ class Linker {
 			return '';
 		}
 
-		# If the target is just a fragment, with no title, we return the frag-
+ 		# If the target is just a fragment, with no title, we return the frag-
 		# ment text.  Otherwise, we return the title text itself.
 		if ( $target->getPrefixedText() === '' and $target->getFragment() !== '' ) {
 			return htmlspecialchars( $target->getFragment() );
@@ -324,14 +325,14 @@ class Linker {
 	 * Generate either a normal exists-style link or a stub link, depending
 	 * on the given page size.
 	 *
- 	 * @param $size Integer
- 	 * @param $nt Title object.
- 	 * @param $text String
- 	 * @param $query String
- 	 * @param $trail String
- 	 * @param $prefix String
- 	 * @return string HTML of link
- 	 * @deprecated
+	 * @param $size Integer
+	 * @param $nt Title object.
+	 * @param $text String
+	 * @param $query String
+	 * @param $trail String
+	 * @param $prefix String
+	 * @return string HTML of link
+	 * @deprecated
 	 */
 	function makeSizeLinkObj( $size, $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
 		global $wgUser;
@@ -1317,7 +1318,7 @@ class Linker {
 	 */
 	function tocLineEnd() {
 		return "</li>\n";
- 	}
+	}
 
 	/**
 	 * Wraps the TOC in a table and provides the hide/collapse javascript.
@@ -1739,7 +1740,7 @@ class Linker {
 	 */
 	function makeLink( $title, $text = '', $query = '', $trail = '' ) {
 		wfProfileIn( __METHOD__ );
-	 	$nt = Title::newFromText( $title );
+		$nt = Title::newFromText( $title );
 		if ( $nt instanceof Title ) {
 			$result = $this->makeLinkObj( $nt, $text, $query, $trail );
 		} else {
-- 
2.20.1