http://www.mediawiki.org/wiki/Special:Code/MediaWiki/64814
Revision: 64814
Author: platonides
Date: 2010-04-09 17:56:42 +0000 (Fri, 09 Apr 2010)
Log Message:
-----------
Follow-up r64811 on fixing bug 23115.
This restores convert rules to the same ones as before r61101.
Modified Paths:
--------------
trunk/phase3/includes/parser/Parser.php
Modified: trunk/phase3/includes/parser/Parser.php
===================================================================
--- trunk/phase3/includes/parser/Parser.php 2010-04-09 17:51:04 UTC (rev
64813)
+++ trunk/phase3/includes/parser/Parser.php 2010-04-09 17:56:42 UTC (rev
64814)
@@ -344,12 +344,22 @@
$this->replaceLinkHolders( $text );
- # The position of the convert() call should not be changed. it
- # assumes that the links are all replaced and the only thing
left
- # is the <nowiki> mark.
+ /**
+ * The page doesn't get language converted if
+ * a) It's disabled
+ * b) Titles aren't converted
+ * c) Content isn't converted and this is not a talk page
+ * d) It's a conversion table
+ */
if ( !( $wgDisableLangConversion
- || isset(
$this->mDoubleUnderscores['nocontentconvert'] )
+ || isset(
$this->mDoubleUnderscores['notitleconvert'] )
+ || ( isset(
$this->mDoubleUnderscores['nocontentconvert'] ) && !$this->mTitle->isTalkPage()
)
|| $this->mTitle->isConversionTable() ) ) {
+
+ # The position of the convert() call should not be
changed. it
+ # assumes that the links are all replaced and the only
thing left
+ # is the <nowiki> mark.
+
$text = $wgContLang->convert( $text );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
