From 9691721f65bd146cfd1a767bd00fb641a0f75fc5 Mon Sep 17 00:00:00 2001
From: "Amir E. Aharoni" <amire80@users.mediawiki.org>
Date: Tue, 17 Jan 2012 00:17:55 +0000
Subject: [PATCH] Follow up to r105855 - now with updated phpunit tests.

---
 includes/Linker.php          | 3 +--
 tests/parser/parserTests.txt | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/includes/Linker.php b/includes/Linker.php
index d4fcb2fd8d..ab921d7f36 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1178,7 +1178,6 @@ class Linker {
 				$link = '';
 			}
 		}
-		$auto = "$link$auto";
 		if ( $pre ) {
 			# written summary $presep autocomment (summary /* section */)
 			$auto = wfMsgExt( 'autocomment-prefix', array( 'escapenoentities', 'content' ) ) . $auto;
@@ -1188,7 +1187,7 @@ class Linker {
 			$auto .= wfMsgExt( 'colon-separator', array( 'escapenoentities', 'content' ) );
 		}
 		$auto = '<span class="autocomment">' . $auto . '</span>';
-		$comment = $pre . $auto . $post;
+		$comment = $pre . $link . $wgLang->getDirMark() . '<span dir="auto">' . $auto . $post . '</span>';
 		return $comment;
 	}
 
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 9dc3a91056..9c276e020b 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -8479,7 +8479,7 @@ comment title=[[Main Page]]
 !! input
 /* External links */ removed bogus entries
 !! result
-<span class="autocomment"><a href="/wiki/Main_Page#External_links" title="Main Page">→</a>External links: </span> removed bogus entries
+<a href="/wiki/Main_Page#External_links" title="Main Page">→</a>‎<span dir="auto"><span class="autocomment">External links: </span> removed bogus entries</span>
 !!end
 
 !! test
@@ -8489,7 +8489,7 @@ comment local title=[[Main Page]]
 !! input
 /* External links */ removed bogus entries
 !! result
-<span class="autocomment"><a href="#External_links">→</a>External links: </span> removed bogus entries
+<a href="#External_links">→</a>‎<span dir="auto"><span class="autocomment">External links: </span> removed bogus entries</span>
 !!end
 
 !! test
@@ -8576,7 +8576,7 @@ title=[[Main Page]]
 !!input
 /* __hello__world__ */
 !! result
-<span class="autocomment"><a href="/wiki/Main_Page#hello_world" title="Main Page">→</a>__hello__world__</span>
+<a href="/wiki/Main_Page#hello_world" title="Main Page">→</a>‎<span dir="auto"><span class="autocomment">__hello__world__</span></span>
 !! end
 
 !! test
-- 
2.20.1