r69381 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r69380‎ | r69381 | r69382 >
Date:12:33, 15 July 2010
Author:tstarling
Status:ok
Tags:
Comment:
Fixed syntax errors from botched merge r69342. Please check your diffs before commit.
Modified paths:
  • /branches/wmf/1.16wmf4/includes/api/ApiQueryBlocks.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php (modified) (history)
  • /branches/wmf/1.16wmf4/includes/api/ApiWatch.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/includes/api/ApiWatch.php
@@ -42,7 +42,7 @@
4343 public function execute() {
4444 global $wgUser;
4545 $this->getMain()->setCachePrivate();
46 - if ( !$wgUser->isLoggedIn() ) {
 46+ if ( !$wgUser->isLoggedIn() )
4747 $this->dieUsage( 'You must be logged-in to have a watchlist', 'notloggedin' );
4848
4949 $params = $this->extractRequestParams();
Index: branches/wmf/1.16wmf4/includes/api/ApiQueryBlocks.php
@@ -124,7 +124,7 @@
125125
126126 // Make sure private data (deleted blocks) isn't cached
127127 $this->getMain()->setVaryCookie();
128 - if ( !$wgUser->isAllowed( 'hideuser' ) ) {
 128+ if ( !$wgUser->isAllowed( 'hideuser' ) )
129129 $this->addWhereFld( 'ipb_deleted', 0 );
130130
131131 // Purge expired entries on one in every 10 queries
@@ -283,4 +283,4 @@
284284 public function getVersion() {
285285 return __CLASS__ . ': $Id$';
286286 }
287 -}
\ No newline at end of file
 287+}
Index: branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php
@@ -96,7 +96,7 @@
9797
9898 if ( $this->fld_patrol ) {
9999 $this->getMain()->setVaryCookie();
100 - if ( !$user->useRCPatrol() && !$user->useNPPatrol() ) {
 100+ if ( !$user->useRCPatrol() && !$user->useNPPatrol() )
101101 $this->dieUsage( 'patrol property is not available', 'patrol' );
102102 }
103103 }
Index: branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
@@ -166,7 +166,7 @@
167167
168168 // Make sure private data (deleted revisions) isn't cached
169169 $this->getMain()->setVaryCookie();
170 - if ( !$wgUser->isAllowed( 'hideuser' ) ) {
 170+ if ( !$wgUser->isAllowed( 'hideuser' ) )
171171 $this->addWhere( $this->getDB()->bitAnd( 'rev_deleted', Revision::DELETED_USER ) . ' = 0' );
172172 // We only want pages by the specified users.
173173 if ( $this->prefixMode )

Follow-up revisions

RevisionCommit summaryAuthorDate
r70061Brought the API cache header handling into sync with the REL1_16 branch, by r...tstarling02:01, 28 July 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r693421.16wmf4: MFT r69339catrope19:27, 14 July 2010

Status & tagging log