Merge "Localisation updates from https://translatewiki.net."

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 8ccc9c2..2cd1222 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -598,6 +598,7 @@ because of Phabricator reports.
   $wgTidyConfig instead.
 * All Tidy configurations other than Remex have been hard deprecated;
   future parsers will not emit compatible output for these configurations.
+  In particular, running MediaWiki with tidy disabled has been deprecated.
 * (T198214) OutputPage::addWikiText(), OutputPage::addWikiTextWithTitle(),
   and OutputPage::addWikiTextTitle() have been deprecated, since they
   can result in untidy output.  In addition OutputPage::addWikiTextTidy()

diff --git a/includes/parser/MWTidy.php b/includes/parser/MWTidy.php
index a73c28c..8881786 100644 (file)
--- a/includes/parser/MWTidy.php
+++ b/includes/parser/MWTidy.php
@@ -117,6 +117,7 @@ class MWTidy {
                                $instance = new MediaWiki\Tidy\RemexDriver( $config );
                                break;
                        case 'disabled':
+                               wfDeprecated( '"disabled" tidy driver', '1.32' );
                                return false;
                        default:
                                throw new MWException( "Invalid tidy driver: \"{$config['driver']}\"" );