From: Tim Starling <tstarling@users.mediawiki.org>
Date: Fri, 7 Jan 2011 01:38:06 +0000 (+0000)
Subject: Update comment for r64876
X-Git-Tag: 1.31.0-rc.0~32727
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=8e42c60b608dc5040490db9db099797b3ad673aa;p=lhc%2Fweb%2Fwiklou.git

Update comment for r64876
---

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index a6fe0a972b..9346ddf532 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -329,18 +329,11 @@ class Parser {
 		}
 
 		/**
-		 * A page get its title converted except:
-		 * 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"
-		 * e) A "nocontentconvert" magic word has been set
-		 * f) A "notitleconvert" magic word has been set
-		 * g) User sets "noconvertlink" in his/her preference
-		 *
-		 * Note that if a user tries to set a title in a conversion
-		 * rule but content conversion was not done, then the parser
-		 * won't pick it up.  This is probably expected behavior.
+		 * A converted title will be provided in the output object if title and
+		 * content conversion are enabled, the article text does not contain 
+		 * a conversion-suppressing double-underscore tag, and no 
+		 * {{DISPLAYTITLE:...}} is present. DISPLAYTITLE takes precedence over
+		 * automatic link conversion.
 		 */
 		if ( !( $wgDisableLangConversion
 				|| $wgDisableTitleConversion