From 333bf3ae5b412fae1e4f57a62a220c941ef50536 Mon Sep 17 00:00:00 2001
From: Liangent <liangent@gmail.com>
Date: Fri, 7 Feb 2014 04:58:34 +0000
Subject: [PATCH] Remove user preference "noconvertlink"

This toggle was introduced in 8d06ad6e, but the most useful feature for
human users there (disabling <h1> conversion on a per-user basis) has
been dropped due to cache fragmentation. The only remaining part is not
quite useful and can be covered by the URL parameter &linkconvert=no.

Change-Id: I12f2cdc9b0d44d6e47487b14fa8ef010de5c94a7
---
 includes/DefaultSettings.php          |  1 -
 includes/Preferences.php              | 10 +---------
 languages/LanguageConverter.php       |  6 ++----
 languages/messages/MessagesEn.php     |  1 -
 maintenance/language/messageTypes.inc |  1 -
 maintenance/language/messages.inc     |  1 -
 6 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 92649475ae..38cf735b8b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3994,7 +3994,6 @@ $wgDefaultUserOptions = array(
 	'minordefault' => 0,
 	'newpageshidepatrolled' => 0,
 	'nickname' => '',
-	'noconvertlink' => 0,
 	'norollbackdiff' => 0,
 	'numberheadings' => 0,
 	'previewonfirst' => 0,
diff --git a/includes/Preferences.php b/includes/Preferences.php
index 04e9114835..387125d13f 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -186,7 +186,7 @@ class Preferences {
 	 */
 	static function profilePreferences( $user, IContextSource $context, &$defaultPreferences ) {
 		global $wgAuth, $wgContLang, $wgParser, $wgCookieExpiration, $wgLanguageCode,
-			$wgDisableTitleConversion, $wgDisableLangConversion, $wgMaxSigChars,
+			$wgDisableLangConversion, $wgMaxSigChars,
 			$wgEnableEmail, $wgEmailConfirmToEdit, $wgEnableUserEmail, $wgEmailAuthentication,
 			$wgEnotifWatchlist, $wgEnotifUserTalk, $wgEnotifRevealEditorAddress,
 			$wgSecureLogin;
@@ -374,14 +374,6 @@ class Preferences {
 						'section' => 'personal/i18n',
 						'help-message' => 'prefs-help-variant',
 					);
-
-					if ( !$wgDisableTitleConversion ) {
-						$defaultPreferences['noconvertlink'] = array(
-							'type' => 'toggle',
-							'section' => 'personal/i18n',
-							'label-message' => 'tog-noconvertlink',
-						);
-					}
 				} else {
 					$defaultPreferences["variant-$langCode"] = array(
 						'type' => 'api',
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index bb5b49fd62..57e73dad2b 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -752,8 +752,7 @@ class LanguageConverter {
 			return;
 		}
 
-		global $wgDisableLangConversion, $wgDisableTitleConversion, $wgRequest,
-			$wgUser;
+		global $wgDisableLangConversion, $wgDisableTitleConversion, $wgRequest;
 		$isredir = $wgRequest->getText( 'redirect', 'yes' );
 		$action = $wgRequest->getText( 'action' );
 		$linkconvert = $wgRequest->getText( 'linkconvert', 'yes' );
@@ -768,8 +767,7 @@ class LanguageConverter {
 				( $isredir == 'no'
 					|| $action == 'edit'
 					|| $action == 'submit'
-					|| $linkconvert == 'no'
-					|| $wgUser->getOption( 'noconvertlink' ) == 1 ) ) ) {
+					|| $linkconvert == 'no' ) ) ) {
 			return;
 		}
 
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 300792ac7a..b9d368c569 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -694,7 +694,6 @@ future releases. Also note that since each list value is wrapped in a unique
 'tog-ccmeonemails'            => 'Send me copies of emails I send to other users',
 'tog-diffonly'                => 'Do not show page content below diffs',
 'tog-showhiddencats'          => 'Show hidden categories',
-'tog-noconvertlink'           => 'Disable link title conversion', # only translate this message to other languages if you have to change it
 'tog-norollbackdiff'          => 'Omit diff after performing a rollback',
 'tog-useeditwarning'          => 'Warn me when I leave an edit page with unsaved changes',
 'tog-prefershttps'            => 'Always use a secure connection when logged in',
diff --git a/maintenance/language/messageTypes.inc b/maintenance/language/messageTypes.inc
index e0dd8eeabd..3dcb36e4a2 100644
--- a/maintenance/language/messageTypes.inc
+++ b/maintenance/language/messageTypes.inc
@@ -280,7 +280,6 @@ $wgOptionalMessages = array(
 	'feed-rss',
 	'unit-pixel',
 	'userrights-irreversible-marker',
-	'tog-noconvertlink',
 	'variantname-zh-hans',
 	'variantname-zh-hant',
 	'variantname-zh-cn',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index d698552274..447e22d568 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -64,7 +64,6 @@ $wgMessageStructure = array(
 		'tog-ccmeonemails',
 		'tog-diffonly',
 		'tog-showhiddencats',
-		'tog-noconvertlink',
 		'tog-norollbackdiff',
 		'tog-useeditwarning',
 		'tog-prefershttps'
-- 
2.20.1