From: Philip Tzou Date: Fri, 9 Apr 2010 20:39:56 +0000 (+0000) Subject: Sorry it's $wgDisableLangConversion. X-Git-Tag: 1.31.0-rc.0~37187 X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=e40921d0b44a6351dd8878cd62410e68f8db9832;p=lhc%2Fweb%2Fwiklou.git Sorry it's $wgDisableLangConversion. --- diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index a4669fcf19..5843a02e24 100644 --- a/includes/parser/Parser.php +++ b/includes/parser/Parser.php @@ -303,7 +303,7 @@ class Parser { * to internalParse() which does all the real work. */ - global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang, $wgDisableLangConversion, $wgUser, $wgRequest, $wgDisableTitleConversion, $wgDisableContentConversion; + global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang, $wgDisableLangConversion, $wgUser, $wgRequest, $wgDisableTitleConversion; $fname = __METHOD__.'-' . wfGetCaller(); wfProfileIn( __METHOD__ ); wfProfileIn( $fname ); @@ -375,7 +375,7 @@ class Parser { * rule but content conversion was not done, then the parser * won't pick it up. This is probably expected behavior. */ - if ( !( $wgDisableContentConversion + if ( !( $wgDisableLangConversion || $wgDisableTitleConversion || $wgRequest->getText( 'redirect', 'yes' ) == 'no' || $wgRequest->getText( 'linkconvert', 'yes' ) == 'no'