Liangent has uploaded a new change for review. https://gerrit.wikimedia.org/r/111968
Change subject: Remove user preference "noconvertlink" ...................................................................... Remove user preference "noconvertlink" This toggle was introduced in 8d06ad6e, but the most useful feature 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 --- M includes/DefaultSettings.php M includes/Preferences.php M languages/LanguageConverter.php M languages/messages/MessagesEn.php 4 files changed, 1 insertion(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/68/111968/1 diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 9264947..38cf735 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3994,7 +3994,6 @@ 'minordefault' => 0, 'newpageshidepatrolled' => 0, 'nickname' => '', - 'noconvertlink' => 0, 'norollbackdiff' => 0, 'numberheadings' => 0, 'previewonfirst' => 0, diff --git a/includes/Preferences.php b/includes/Preferences.php index 04e9114..9ced6bc 100644 --- a/includes/Preferences.php +++ b/includes/Preferences.php @@ -374,14 +374,6 @@ '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 bb5b49f..7231477 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -768,8 +768,7 @@ ( $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 300792a..b9d368c 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -694,7 +694,6 @@ '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', -- To view, visit https://gerrit.wikimedia.org/r/111968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12f2cdc9b0d44d6e47487b14fa8ef010de5c94a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Liangent <liang...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits