http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69381
Revision: 69381
Author: tstarling
Date: 2010-07-15 12:33:57 +0000 (Thu, 15 Jul 2010)
Log Message:
-----------
Fixed syntax errors from botched merge r69342. Please check your diffs before
commit.
Modified Paths:
--------------
branches/wmf/1.16wmf4/includes/api/ApiQueryBlocks.php
branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php
branches/wmf/1.16wmf4/includes/api/ApiWatch.php
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryBlocks.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryBlocks.php 2010-07-15
09:41:46 UTC (rev 69380)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryBlocks.php 2010-07-15
12:33:57 UTC (rev 69381)
@@ -124,7 +124,7 @@
// Make sure private data (deleted blocks) isn't cached
$this->getMain()->setVaryCookie();
- if ( !$wgUser->isAllowed( 'hideuser' ) ) {
+ if ( !$wgUser->isAllowed( 'hideuser' ) )
$this->addWhereFld( 'ipb_deleted', 0 );
// Purge expired entries on one in every 10 queries
@@ -283,4 +283,4 @@
public function getVersion() {
return __CLASS__ . ': $Id$';
}
-}
\ No newline at end of file
+}
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
2010-07-15 09:41:46 UTC (rev 69380)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
2010-07-15 12:33:57 UTC (rev 69381)
@@ -166,7 +166,7 @@
// Make sure private data (deleted revisions) isn't cached
$this->getMain()->setVaryCookie();
- if ( !$wgUser->isAllowed( 'hideuser' ) ) {
+ if ( !$wgUser->isAllowed( 'hideuser' ) )
$this->addWhere( $this->getDB()->bitAnd( 'rev_deleted',
Revision::DELETED_USER ) . ' = 0' );
// We only want pages by the specified users.
if ( $this->prefixMode )
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php 2010-07-15
09:41:46 UTC (rev 69380)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php 2010-07-15
12:33:57 UTC (rev 69381)
@@ -96,7 +96,7 @@
if ( $this->fld_patrol ) {
$this->getMain()->setVaryCookie();
- if ( !$user->useRCPatrol() &&
!$user->useNPPatrol() ) {
+ if ( !$user->useRCPatrol() &&
!$user->useNPPatrol() )
$this->dieUsage( 'patrol property is
not available', 'patrol' );
}
}
Modified: branches/wmf/1.16wmf4/includes/api/ApiWatch.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiWatch.php 2010-07-15 09:41:46 UTC
(rev 69380)
+++ branches/wmf/1.16wmf4/includes/api/ApiWatch.php 2010-07-15 12:33:57 UTC
(rev 69381)
@@ -42,7 +42,7 @@
public function execute() {
global $wgUser;
$this->getMain()->setCachePrivate();
- if ( !$wgUser->isLoggedIn() ) {
+ if ( !$wgUser->isLoggedIn() )
$this->dieUsage( 'You must be logged-in to have a
watchlist', 'notloggedin' );
$params = $this->extractRequestParams();
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
