Follow-up r64811 on fixing bug 23115.

This restores convert rules to the same ones as before r61101.

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 1852bdf..fb3cf39 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -344,12 +344,22 @@ class Parser {
 
                $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 );
                }