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 "SpecialMovepage: Convert form to use OOUI controls"
[lhc/web/wiklou.git]
/
includes
/
parser
/
Parser.php
diff --git
a/includes/parser/Parser.php
b/includes/parser/Parser.php
index
ab5c586
..
677da63
100644
(file)
--- a/
includes/parser/Parser.php
+++ b/
includes/parser/Parser.php
@@
-1283,8
+1283,6
@@
class Parser {
* @return string
*/
private function internalParseHalfParsed( $text, $isMain = true, $linestart = true ) {
* @return string
*/
private function internalParseHalfParsed( $text, $isMain = true, $linestart = true ) {
- global $wgUseTidy, $wgAlwaysUseTidy;
-
$text = $this->mStripState->unstripGeneral( $text );
if ( $isMain ) {
$text = $this->mStripState->unstripGeneral( $text );
if ( $isMain ) {
@@
-1335,7
+1333,7
@@
class Parser {
$text = Sanitizer::normalizeCharReferences( $text );
$text = Sanitizer::normalizeCharReferences( $text );
- if (
( $wgUseTidy && $this->mOptions->getTidy() ) || $wgAlwaysUseTidy
) {
+ if (
MWTidy::isEnabled() && $this->mOptions->getTidy()
) {
$text = MWTidy::tidy( $text );
} else {
# attempt to sanitize at least some nesting problems
$text = MWTidy::tidy( $text );
} else {
# attempt to sanitize at least some nesting problems