diff options
author | Sam Reed <reedy@users.mediawiki.org> | 2011-07-01 02:25:19 +0000 |
---|---|---|
committer | Sam Reed <reedy@users.mediawiki.org> | 2011-07-01 02:25:19 +0000 |
commit | bdc31bb9bc995e28b2cf79cba8e95e44513da635 (patch) | |
tree | 5441e504431b4cda6930be57dbeda95fc3ecbbf4 /includes/api | |
parent | bb1df74f8715dcb2ec55a029c981d51ffdf50349 (diff) | |
download | mediawikicore-bdc31bb9bc995e28b2cf79cba8e95e44513da635.tar.gz mediawikicore-bdc31bb9bc995e28b2cf79cba8e95e44513da635.zip |
Change usages of $wgUser->getSkin() in special pages to use $this->getSkin()
Fix trailing whitespace
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/91246
Diffstat (limited to 'includes/api')
-rw-r--r-- | includes/api/ApiQueryFilearchive.php | 4 | ||||
-rw-r--r-- | includes/api/ApiQueryWatchlist.php | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/includes/api/ApiQueryFilearchive.php b/includes/api/ApiQueryFilearchive.php index 54d5a45cf76f..e746a6c49979 100644 --- a/includes/api/ApiQueryFilearchive.php +++ b/includes/api/ApiQueryFilearchive.php @@ -181,7 +181,7 @@ class ApiQueryFilearchive extends ApiQueryBase { if ( $fld_mime ) { $file['mime'] = "$row->fa_major_mime/$row->fa_minor_mime"; } - + if ( $row->fa_deleted & File::DELETED_FILE ) { $file['filehidden'] = ''; } @@ -196,7 +196,7 @@ class ApiQueryFilearchive extends ApiQueryBase { $file['suppressed'] = ''; } - + $fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $file ); if ( !$fit ) { $this->setContinueEnumParameter( 'from', $this->keyToTitle( $row->fa_name ) ); diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index e5507f622f5d..a5023ea30dec 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -133,11 +133,11 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { $this->addWhere( array( 'rc_deleted' => 0, ) ); - + $db = $this->getDB(); - $this->addWhereRange( 'rc_timestamp', $params['dir'], - $db->timestamp( $params['start'] ), + $this->addWhereRange( 'rc_timestamp', $params['dir'], + $db->timestamp( $params['start'] ), $db->timestamp( $params['end'] ) ); $this->addWhereFld( 'wl_namespace', $params['namespace'] ); $this->addWhereIf( 'rc_this_oldid=page_latest OR rc_type=' . RC_LOG, !$params['allrev'] ); @@ -293,7 +293,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { if ( $this->fld_parsedcomment && isset( $row->rc_comment ) ) { global $wgUser; - $vals['parsedcomment'] = $wgUser->getSkin()->formatComment( $row->rc_comment, $title ); + $vals['parsedcomment'] = $this->getSkin()->formatComment( $row->rc_comment, $title ); } if ( $this->fld_loginfo && $row->rc_type == RC_LOG ) { |