From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Mon, 19 Sep 2011 10:43:00 +0000 (+0000)
Subject: * (bug 27398) Add $wgExtraGenderNamespaces for configured gendered namespaces
X-Git-Tag: 1.31.0-rc.0~27569
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=9a17cead4ac8698bbb4519c8eb8df72f5ec2a6b9;p=lhc%2Fweb%2Fwiklou.git

* (bug 27398) Add $wgExtraGenderNamespaces for configured gendered namespaces
---

diff --git a/languages/Language.php b/languages/Language.php
index 1b13d6ba28..87953534f7 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -428,9 +428,19 @@ class Language {
 	 * @since 1.18
 	 */
 	function needsGenderDistinction() {
-		global $wgExtraGenderNamespaces;
-		$aliases = $wgExtraGenderNamespaces + self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' );
-		return count( $aliases ) > 0;
+		global $wgExtraGenderNamespaces, $wgExtraNamespaces;
+		if ( count( $wgExtraGenderNamespaces ) > 0 ) {
+			// $wgExtraGenderNamespaces overrides everything
+			return true;
+		} elseif( isset( $wgExtraNamespaces[NS_USER] ) && isset( $wgExtraNamespaces[NS_USER_TALK] ) ) {
+			/// @todo There may be other gender namespace than NS_USER & NS_USER_TALK in the future
+			// $wgExtraNamespaces overrides any gender aliases specified in i18n files
+			return false;
+		} else {
+			// Check what is in i18n files
+			$alises = self::$dataCache->getItem( $this->mCode, 'namespaceGenderAliases' );
+			return count( $aliases ) > 0;
+		}
 	}
 
 	/**