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 "WebInstallerOutput: Restore 'global $wgResourceModules'"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialExpandTemplates.php
diff --git
a/includes/specials/SpecialExpandTemplates.php
b/includes/specials/SpecialExpandTemplates.php
index
35a3ba1
..
269dff6
100644
(file)
--- a/
includes/specials/SpecialExpandTemplates.php
+++ b/
includes/specials/SpecialExpandTemplates.php
@@
-41,7
+41,7
@@
class SpecialExpandTemplates extends SpecialPage {
/** @var bool Whether or not to remove <nowiki> tags in the expanded wikitext */
protected $removeNowiki;
/** @var bool Whether or not to remove <nowiki> tags in the expanded wikitext */
protected $removeNowiki;
- /** @var
m
aximum size in bytes to include. 50MB allows fixing those huge pages */
+ /** @var
int M
aximum size in bytes to include. 50MB allows fixing those huge pages */
const MAX_INCLUDE_SIZE = 50000000;
function __construct() {
const MAX_INCLUDE_SIZE = 50000000;
function __construct() {
@@
-50,9
+50,10
@@
class SpecialExpandTemplates extends SpecialPage {
/**
* Show the special page
/**
* Show the special page
+ * @param string|null $subpage
*/
function execute( $subpage ) {
*/
function execute( $subpage ) {
- global $wgParser
, $wgUseTidy, $wgAlwaysUseTidy
;
+ global $wgParser;
$this->setHeaders();
$this->setHeaders();
@@
-112,7
+113,8
@@
class SpecialExpandTemplates extends SpecialPage {
);
}
);
}
- if ( ( $wgUseTidy && $options->getTidy() ) || $wgAlwaysUseTidy ) {
+ $config = $this->getConfig();
+ if ( ( $config->get( 'UseTidy' ) && $options->getTidy() ) || $config->get( 'AlwaysUseTidy' ) ) {
$tmp = MWTidy::tidy( $tmp );
}
$tmp = MWTidy::tidy( $tmp );
}