diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:32:59 -0400 |
| commit | 6dc1997577fab2c366781fd7048144935afa0012 (patch) | |
| tree | 8918d28c7ab4342f0738985e37af1dfc42d0e93a /includes/api/ApiQueryWatchlist.php | |
| parent | 150f94f051128f367bc89f6b7e5f57eb2a69fc62 (diff) | |
| parent | fa89acd685cb09cdbe1c64cbb721ec64975bbbc1 (diff) | |
Merge commit 'fa89acd'
# Conflicts:
# .gitignore
# extensions/ArchInterWiki.sql
Diffstat (limited to 'includes/api/ApiQueryWatchlist.php')
| -rw-r--r-- | includes/api/ApiQueryWatchlist.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 9f7387c7..648d2596 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -332,9 +332,9 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { } if ( Revision::userCanBitfield( $row->rc_deleted, Revision::DELETED_USER, $user ) ) { if ( $this->fld_userid ) { - $vals['userid'] = $row->rc_user; + $vals['userid'] = (int)$row->rc_user; // for backwards compatibility - $vals['user'] = $row->rc_user; + $vals['user'] = (int)$row->rc_user; } if ( $this->fld_user ) { @@ -451,6 +451,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { 'prop' => array( ApiBase::PARAM_ISMULTI => true, ApiBase::PARAM_DFLT => 'ids|title|flags', + ApiBase::PARAM_HELP_MSG_PER_VALUE => array(), ApiBase::PARAM_TYPE => array( 'ids', 'title', |