http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64830
Revision: 64830
Author: platonides
Date: 2010-04-09 20:47:05 +0000 (Fri, 09 Apr 2010)
Log Message:
-----------
Follow up r64828. It was a typo, there's no variable called
$wgDisableContentConversion
Modified Paths:
--------------
branches/REL1_16/phase3/includes/parser/Parser.php
branches/wmf/1.16wmf4/includes/parser/Parser.php
trunk/phase3/includes/parser/Parser.php
Modified: branches/REL1_16/phase3/includes/parser/Parser.php
===================================================================
--- branches/REL1_16/phase3/includes/parser/Parser.php 2010-04-09 20:39:56 UTC
(rev 64829)
+++ branches/REL1_16/phase3/includes/parser/Parser.php 2010-04-09 20:47:05 UTC
(rev 64830)
@@ -365,7 +365,7 @@
/**
* A page get its title converted except:
- * a) Content convert is globally disabled
+ * a) Language conversion is globally disabled
* b) Title convert is globally disabled
* c) The page is a redirect page
* d) User request with a "linkconvert" set to "no"
@@ -377,7 +377,7 @@
* 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'
Modified: branches/wmf/1.16wmf4/includes/parser/Parser.php
===================================================================
--- branches/wmf/1.16wmf4/includes/parser/Parser.php 2010-04-09 20:39:56 UTC
(rev 64829)
+++ branches/wmf/1.16wmf4/includes/parser/Parser.php 2010-04-09 20:47:05 UTC
(rev 64830)
@@ -365,7 +365,7 @@
/**
* A page get its title converted except:
- * a) Content convert is globally disabled
+ * a) Language conversion is globally disabled
* b) Title convert is globally disabled
* c) The page is a redirect page
* d) User request with a "linkconvert" set to "no"
@@ -377,7 +377,7 @@
* 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'
Modified: trunk/phase3/includes/parser/Parser.php
===================================================================
--- trunk/phase3/includes/parser/Parser.php 2010-04-09 20:39:56 UTC (rev
64829)
+++ trunk/phase3/includes/parser/Parser.php 2010-04-09 20:47:05 UTC (rev
64830)
@@ -303,7 +303,7 @@
* to internalParse() which does all the real work.
*/
- global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang,
$wgDisableLangConversion, $wgUser, $wgRequest, $wgDisableTitleConversion;
+ global $wgUseTidy, $wgAlwaysUseTidy, $wgContLang,
$wgDisableLangConversion, $wgDisableTitleConversion, $wgUser, $wgRequest;
$fname = __METHOD__.'-' . wfGetCaller();
wfProfileIn( __METHOD__ );
wfProfileIn( $fname );
@@ -363,7 +363,7 @@
/**
* A page get its title converted except:
- * a) Content convert is globally disabled
+ * a) Language conversion is globally disabled
* b) Title convert is globally disabled
* c) The page is a redirect page
* d) User request with a "linkconvert" set to "no"
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
