dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "rdbms: add and enforce DB_REPLICA/DB_MASTER roles in DBConnRef"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialExpandTemplates.php
diff --git
a/includes/specials/SpecialExpandTemplates.php
b/includes/specials/SpecialExpandTemplates.php
index
0c18a48
..
9ea5e08
100644
(file)
--- a/
includes/specials/SpecialExpandTemplates.php
+++ b/
includes/specials/SpecialExpandTemplates.php
@@
-115,8
+115,10
@@
class SpecialExpandTemplates extends SpecialPage {
}
$config = $this->getConfig();
}
$config = $this->getConfig();
- if (
$config->get( 'UseTidy'
) && $options->getTidy() ) {
+ if (
MWTidy::isEnabled(
) && $options->getTidy() ) {
$tmp = MWTidy::tidy( $tmp );
$tmp = MWTidy::tidy( $tmp );
+ } else {
+ wfDeprecated( 'disabling tidy', '1.33' );
}
$out->addHTML( $tmp );
}
$out->addHTML( $tmp );
@@
-152,7
+154,6
@@
class SpecialExpandTemplates extends SpecialPage {
*
* @param string $title Value for context title field
* @param string $input Value for input textbox
*
* @param string $title Value for context title field
* @param string $input Value for input textbox
- * @return string
*/
private function makeForm( $title, $input ) {
$fields = [
*/
private function makeForm( $title, $input ) {
$fields = [
@@
-164,7
+165,6
@@
class SpecialExpandTemplates extends SpecialPage {
'size' => 60,
'default' => $title,
'autofocus' => true,
'size' => 60,
'default' => $title,
'autofocus' => true,
- 'cssclass' => 'mw-ui-input-inline',
],
'input' => [
'type' => 'textarea',
],
'input' => [
'type' => 'textarea',