From 388e4425bf273831b5cad5ab3405fb586cdf6770 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Fri, 8 Oct 2010 18:52:23 +0000
Subject: [PATCH] Fix double-escaping for section edit link tooltips

Bug 25462.
---
 RELEASE-NOTES       | 1 +
 includes/Linker.php | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 540290a30f..69eddfdc1c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -354,6 +354,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 25167) Correctly load JS fixes for IE6 (fixing a regression in 1.16)
 * (bug 25367) wfShellExec() is more explicit when failing due to disabled
   passthru()
+* (bug 25462) Fix double-escaping for section edit link tooltips
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.
diff --git a/includes/Linker.php b/includes/Linker.php
index 5e3d48b77a..94138721b7 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1377,6 +1377,8 @@ class Linker {
 		// added to it for LTR text on RTL pages
 		$attribs = array();
 		if ( !is_null( $tooltip ) ) {
+			# Bug 25462: undo double-escaping.
+			$tooltip = Sanitizer::decodeCharReferences( $tooltip );
 			$attribs['title'] = wfMsgReal( 'editsectionhint', array( $tooltip ), true, $lang );
 		}
 		$link = $this->link( $nt, wfMsgExt( 'editsection', array( 'language' => $lang ) ),
-- 
2.20.1