From b22d2155fcb58bc18efd5cb921d664d903199aa2 Mon Sep 17 00:00:00 2001 From: Petr Onderka Date: Sat, 16 Feb 2013 19:30:57 +0100 Subject: [PATCH] Return user ID as userid in watchlist API module Currently, the watchlist module returns both user ID and user name as 'user'. This is not only confusing, but it also means both can't be returned at the same time. This change fixes that, by returning user ID as 'userid' and user name as 'user'. For backwards compatibility, if only user ID is requested, both 'user' and 'userid' will contain the user ID. This could be considered a breaking change if both user ID and user name are requested, but in that case, the output is currently broken anyway. Change-Id: I50364659f8fec0136d4ef25ccf137d509df33c41 --- includes/api/ApiQueryWatchlist.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index dd5062450a..53f4230630 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -240,14 +240,16 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { if ( $this->fld_user || $this->fld_userid ) { - if ( $this->fld_user ) { - $vals['user'] = $row->rc_user_text; - } - if ( $this->fld_userid ) { + $vals['userid'] = $row->rc_user; + // for backwards compatibility $vals['user'] = $row->rc_user; } + if ( $this->fld_user ) { + $vals['user'] = $row->rc_user_text; + } + if ( !$row->rc_user ) { $vals['anon'] = ''; } -- 2.20.1