From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Fri, 13 Feb 2009 17:50:24 +0000 (+0000)
Subject: bug 17477 and fix for r47196: Don't use global $title; this can work when executing... 
X-Git-Tag: 1.31.0-rc.0~42904
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=a64b0d1c71dc426a82c9e6ab341c427688bbc2e2;p=lhc%2Fweb%2Fwiklou.git

bug 17477 and fix for r47196: Don't use global $title; this can work when executing index.php, but fails horribly in maintenance scripts (breaking checkBadRedirects.php at least)
---

diff --git a/includes/Title.php b/includes/Title.php
index 649f764e50..a2047541d3 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -571,8 +571,8 @@ class Title {
 		return $this->getNsTextInternal( $this->mNamespace );
 	}
 
-	function getNsTextInternal( $namespace) {
-		global $wgContLang, $wgSlowGenderAliases, $wgTitle, $title;
+	function getNsTextInternal( $namespace ) {
+		global $wgContLang, $wgRequest, $wgTitle, $wgSlowGenderAliases;
 		if( $namespace === NS_USER || $namespace === NS_USER_TALK ) {
 			static $gender = null;
 
@@ -581,13 +581,13 @@ class Title {
 				$gender[$name] = User::getDefaultOption( 'gender' );
 
 				// wgTitle may not be defined
-				$mytitle = isset($wgTitle) ? $wgTitle: Title::newFromText($title);
+				$mytitle = isset( $wgTitle ) ? $wgTitle : Title::newFromText( $wgRequest->getVal( 'title' ) );
 
 				// Check stuff
 				if ( $wgSlowGenderAliases ||
 				     // Needs to be checked always to produce desired
 				     // effect when viewing user pages
-				     ($mytitle && $name === $mytitle->getBaseText()) ) {
+				     ( $mytitle && $name === $mytitle->getBaseText() ) ) {
 
 					$user = User::newFromName( $name );
 					if ( $user ) $gender[$name] = $user->getOption( 'gender' );