Followup to r49056: gender property gives "unknown" when gender option is null
authorTim Starling <tstarling@users.mediawiki.org>
Wed, 3 Jun 2009 15:36:44 +0000 (15:36 +0000)
committerTim Starling <tstarling@users.mediawiki.org>
Wed, 3 Jun 2009 15:36:44 +0000 (15:36 +0000)
includes/api/ApiQueryUsers.php

index 23d0ae7..d3d4b60 100644 (file)
@@ -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();