From 84b6aa1ce35f10958fb767693dc81fba6bf6bbf1 Mon Sep 17 00:00:00 2001 From: Platonides Date: Fri, 9 Apr 2010 17:56:42 +0000 Subject: [PATCH] Follow-up r64811 on fixing bug 23115. This restores convert rules to the same ones as before r61101. --- includes/parser/Parser.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php index 1852bdf00a..fb3cf3942a 100644 --- 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 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 mark. + $text = $wgContLang->convert( $text ); } -- 2.20.1