diff --git a/RELEASE-NOTES-1.35 b/RELEASE-NOTES-1.35 index 970273166bb..f443afb5e26 100644 --- a/RELEASE-NOTES-1.35 +++ b/RELEASE-NOTES-1.35 @@ -75,6 +75,8 @@ For notes on 1.34.x and older releases, see HISTORY. skin from being shown, use $wgSkipSkins. * $wgMaxGeneratedPPNodeCount - This setting was removed. It only affected Preprocessor_DOM, which was deprecated in 1.34 and removed in this release. +* $wgFixArabicUnicode and $wgFixMalayalamUnicode, deprecated in 1.33, were + removed. The fixes are now always enabled for their respective languages. * … === New user-facing features in 1.35 === diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index de5fe95c7f0..e60f53f428a 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3073,39 +3073,11 @@ $wgExtraLanguageCodes = [ */ $wgDummyLanguageCodes = []; -/** - * Set this to true to replace Arabic presentation forms with their standard - * forms in the U+0600-U+06FF block. This only works if $wgLanguageCode is - * set to "ar". - * - * Note that pages with titles containing presentation forms will become - * inaccessible, run maintenance/cleanupTitles.php to fix this. - * - * @deprecated since 1.33: in the future will always be true. - */ -$wgFixArabicUnicode = true; - -/** - * Set this to true to replace ZWJ-based chillu sequences in Malayalam text - * with their Unicode 5.1 equivalents. This only works if $wgLanguageCode is - * set to "ml". Note that some clients (even new clients as of 2010) do not - * support these characters. - * - * If you enable this on an existing wiki, run maintenance/cleanupTitles.php to - * fix any ZWJ sequences in existing page titles. - * - * @deprecated since 1.33: in the future will always be true. - */ -$wgFixMalayalamUnicode = true; - /** * Set this to always convert certain Unicode sequences to modern ones * regardless of the content language. This has a small performance * impact. * - * See $wgFixArabicUnicode and $wgFixMalayalamUnicode for conversion - * details. - * * @since 1.17 */ $wgAllUnicodeFixes = false; diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php index 5afd1fff66c..4bfd899909d 100644 --- a/includes/api/ApiQuerySiteinfo.php +++ b/includes/api/ApiQuerySiteinfo.php @@ -181,8 +181,8 @@ class ApiQuerySiteinfo extends ApiQueryBase { $data['invalidusernamechars'] = $config->get( 'InvalidUsernameCharacters' ); $data['allunicodefixes'] = (bool)$config->get( 'AllUnicodeFixes' ); - $data['fixarabicunicode'] = (bool)$config->get( 'FixArabicUnicode' ); - $data['fixmalayalamunicode'] = (bool)$config->get( 'FixMalayalamUnicode' ); + $data['fixarabicunicode'] = true; // Config removed in 1.35, always true + $data['fixmalayalamunicode'] = true; // Config removed in 1.35, always true global $IP; $git = SpecialVersion::getGitHeadSha1( $IP ); diff --git a/languages/classes/LanguageAr.php b/languages/classes/LanguageAr.php index 24b5e6c5ce9..aec8f7c11d0 100644 --- a/languages/classes/LanguageAr.php +++ b/languages/classes/LanguageAr.php @@ -41,13 +41,8 @@ class LanguageAr extends Language { * @return string */ public function normalize( $s ) { - global $wgFixArabicUnicode; $s = parent::normalize( $s ); - if ( $wgFixArabicUnicode ) { - $s = $this->transformUsingPairFile( 'normalize-ar.php', $s ); - } else { - wfDeprecated( '$wgFixArabicUnicode = false', '1.33' ); - } + $s = $this->transformUsingPairFile( 'normalize-ar.php', $s ); return $s; } } diff --git a/languages/classes/LanguageMl.php b/languages/classes/LanguageMl.php index 3dd0d37ebfa..e00311b480e 100644 --- a/languages/classes/LanguageMl.php +++ b/languages/classes/LanguageMl.php @@ -42,13 +42,8 @@ class LanguageMl extends Language { * @return string */ public function normalize( $s ) { - global $wgFixMalayalamUnicode; $s = parent::normalize( $s ); - if ( $wgFixMalayalamUnicode ) { - $s = $this->transformUsingPairFile( 'normalize-ml.php', $s ); - } else { - wfDeprecated( '$wgFixMalayalamUnicode = false', '1.33' ); - } + $s = $this->transformUsingPairFile( 'normalize-ml.php', $s ); return $s; } } diff --git a/tests/phpunit/languages/classes/LanguageArTest.php b/tests/phpunit/languages/classes/LanguageArTest.php index c7ff3bb9722..4950f091b6b 100644 --- a/tests/phpunit/languages/classes/LanguageArTest.php +++ b/tests/phpunit/languages/classes/LanguageArTest.php @@ -30,12 +30,7 @@ class LanguageArTest extends LanguageClassesTestCase { throw new Exception( 'Expected output must differ.' ); } - $this->setMwGlobals( 'wgFixArabicUnicode', true ); $this->assertSame( $expected, $this->getLang()->normalize( $input ), 'ar-normalised form' ); - - $this->setMwGlobals( 'wgFixArabicUnicode', false ); - $this->hideDeprecated( '$wgFixArabicUnicode = false' ); - $this->assertSame( $input, $this->getLang()->normalize( $input ), 'regular normalised form' ); } public static function provideNormalize() { diff --git a/tests/phpunit/languages/classes/LanguageMlTest.php b/tests/phpunit/languages/classes/LanguageMlTest.php index 5d69a4fab9b..14a5acce12f 100644 --- a/tests/phpunit/languages/classes/LanguageMlTest.php +++ b/tests/phpunit/languages/classes/LanguageMlTest.php @@ -49,12 +49,7 @@ class LanguageMlTest extends LanguageClassesTestCase { throw new Exception( 'Expected output must differ.' ); } - $this->setMwGlobals( 'wgFixMalayalamUnicode', true ); $this->assertSame( $expected, $this->getLang()->normalize( $input ), 'ml-normalised form' ); - - $this->setMwGlobals( 'wgFixMalayalamUnicode', false ); - $this->hideDeprecated( '$wgFixMalayalamUnicode = false' ); - $this->assertSame( $input, $this->getLang()->normalize( $input ), 'regular normalised form' ); } public static function provideNormalize() {