Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Duplicate "definition" of $wgUser in same method

Browse source 
Move $wgDBtype later so only obtained if needed (ie we haven't died before then)
This commit is contained in:
Sam Reed 2010-01-29 14:43:26 +00:00
parent 5d553e35a3
commit f507c00826
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/api/ApiQueryWatchlist.php
View file

@ -52,7 +52,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
$fld_timestamp = false, $fld_user = false, $fld_comment = false, $fld_sizes = false;
private function run( $resultPageSet = null ) {
global $wgUser, $wgDBtype;
global $wgUser;
$this->selectNamedDB( 'watchlist', DB_SLAVE, 'watchlist' );
@ -150,9 +150,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
$this->dieUsage( "Incorrect parameter - mutually exclusive values may not be supplied", 'show' );
}
// Check permissions. FIXME: should this check $user instead of
// $wgUser?
global $wgUser;
// Check permissions. FIXME: should this check $user instead of $wgUser?
if ( ( isset( $show['patrolled'] ) || isset( $show['!patrolled'] ) ) && !$wgUser->useRCPatrol() && !$wgUser->useNPPatrol() )
$this->dieUsage( "You need the patrol right to request the patrolled flag", 'permissiondenied' );
@ -174,7 +172,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
if ( !is_null( $params['excludeuser'] ) )
$this->addWhere( 'rc_user_text != ' . $this->getDB()->addQuotes( $params['excludeuser'] ) );
global $wgDBtype;
// This is an index optimization for mysql, as done in the Special:Watchlist page
$this->addWhereIf( "rc_timestamp > ''", !isset ( $params['start'] ) && !isset ( $params['end'] ) && $wgDBtype == 'mysql' );