From 65c6f8c19a644490523aad7276a6683817c413da Mon Sep 17 00:00:00 2001
From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 19 Nov 2011 16:40:23 +0000
Subject: [PATCH] Bug 32238 - phaseout wgEnableTooltipsAndAccesskeys

---
 RELEASE-NOTES-1.19           |  1 +
 includes/DefaultSettings.php |  7 -------
 includes/Linker.php          | 10 ----------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 733fa52aa3..c1bf148148 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -23,6 +23,7 @@ production.
 * Introduced $wgQueryPageDefaultLimit (defaults to 50) for the number of
   items to show by default on query pages (special pages such as Whatlinkshere).
 * (bug 32470) Increase the length of ug_group
+* (bug 32239) Removed wgEnableTooltipsAndAccesskeys
 
 === New features in 1.19 ===
 * (bug 19838) Possibility to get all interwiki prefixes if the interwiki
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 65b9eb1fae..7cde88c835 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2344,13 +2344,6 @@ $wgUseSiteJs = true;
 /** Use the site's Cascading Style Sheets (CSS)? */
 $wgUseSiteCss = true;
 
-/**
- * Set to false to disable application of access keys and tooltips,
- * eg to avoid keyboard conflicts with system keys or as a low-level
- * optimization.
- */
-$wgEnableTooltipsAndAccesskeys = true;
-
 /**
  * Break out of framesets. This can be used to prevent clickjacking attacks,
  * or to prevent external sites from framing your site with ads.
diff --git a/includes/Linker.php b/includes/Linker.php
index aa4aab9857..7b5a9a385a 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1713,10 +1713,6 @@ class Linker {
 	 *   escape), or false for no title attribute
 	 */
 	public static function titleAttrib( $name, $options = null ) {
-		global $wgEnableTooltipsAndAccesskeys;
-		if ( !$wgEnableTooltipsAndAccesskeys )
-			return false;
-
 		wfProfileIn( __METHOD__ );
 
 		$message = wfMessage( "tooltip-$name" );
@@ -2006,9 +2002,6 @@ class Linker {
 	 * Returns the attributes for the tooltip and access key.
 	 */
 	public static function tooltipAndAccesskeyAttribs( $name ) {
-		global $wgEnableTooltipsAndAccesskeys;
-		if ( !$wgEnableTooltipsAndAccesskeys )
-			return array();
 		# @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
 		# no attribute" instead of "output '' as value for attribute", this
 		# would be three lines.
@@ -2030,9 +2023,6 @@ class Linker {
 	 * Returns raw bits of HTML, use titleAttrib()
 	 */
 	public static function tooltip( $name, $options = null ) {
-		global $wgEnableTooltipsAndAccesskeys;
-		if ( !$wgEnableTooltipsAndAccesskeys )
-			return '';
 		# @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
 		# no attribute" instead of "output '' as value for attribute", this
 		# would be two lines.
-- 
2.20.1