Merge "ImageListPager: Actor migration for buildQueryConds()"

[lhc/web/wiklou.git] / includes / specials / SpecialExpandTemplates.php

diff --git a/includes/specials/SpecialExpandTemplates.php b/includes/specials/SpecialExpandTemplates.php
index 0c18a48..619665b 100644 (file)
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -115,8 +115,10 @@ class SpecialExpandTemplates extends SpecialPage {
                        }
 
                        $config = $this->getConfig();
-                       if ( $config->get( 'UseTidy' ) && $options->getTidy() ) {
+                       if ( MWTidy::isEnabled() && $options->getTidy() ) {
                                $tmp = MWTidy::tidy( $tmp );
+                       } else {
+                               wfDeprecated( 'disabling tidy', '1.33' );
                        }
 
                        $out->addHTML( $tmp );
@@ -164,7 +166,6 @@ class SpecialExpandTemplates extends SpecialPage {
                                'size' => 60,
                                'default' => $title,
                                'autofocus' => true,
-                               'cssclass' => 'mw-ui-input-inline',
                        ],
                        'input' => [
                                'type' => 'textarea',