Merge "Remove most support for configuring Tidy, including Raggett"

[lhc/web/wiklou.git] / includes / parser / ParserOptions.php

diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index a8da3ce..032d481 100644 (file)
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -57,7 +57,7 @@ class ParserOptions {
 
        /**
         * Lazy-loaded options
-        * @var callback[]
+        * @var callable[]
         */
        private static $lazyOptions = [
                'dateformat' => [ __CLASS__, 'initDateFormat' ],
@@ -1098,7 +1098,7 @@ class ParserOptions {
                        // *UPDATE* ParserOptions::matches() if any of this changes as needed
                        self::$defaults = [
                                'dateformat' => null,
-                               'tidy' => false,
+                               'tidy' => true,
                                'interfaceMessage' => false,
                                'targetLanguage' => null,
                                'removeComments' => true,
@@ -1164,7 +1164,6 @@ class ParserOptions {
                global $wgEnableParserLimitReporting;
 
                return [
-                       'tidy' => true,
                        'enableLimitReport' => $wgEnableParserLimitReporting,
                ];
        }