From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 3 Jun 2009 15:36:44 +0000 (+0000)
Subject: Followup to r49056: gender property gives "unknown" when gender option is null
X-Git-Tag: 1.31.0-rc.0~41523
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=ecaa39d51b43f7847b782095955f0ba6caa6936b;p=lhc%2Fweb%2Fwiklou.git

Followup to r49056: gender property gives "unknown" when gender option is null
---

diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 23d0ae73c9..d3d4b609d2 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -145,8 +145,15 @@ if (!defined('MEDIAWIKI')) {
 				}
 				if(isset($this->prop['emailable']) && $user->canReceiveEmail())
 					$data[$name]['emailable'] = '';
-				if(isset($this->prop['gender']))
-					$data[$name]['gender'] = $user->getOption( 'gender' );
+
+				if(isset($this->prop['gender'])) {
+					$gender = $user->getOption( 'gender' );
+					if ( strval( $gender ) === '' ) {
+						$gender = 'unknown';
+					}
+					$data[$name]['gender'] = $gender;
+				}
+
 				if(!is_null($params['token']))
 				{
 					$tokenFunctions = $this->getTokenFunctions();