From 88f7649258439b6d8f30bb7ce25c60663b8547bc Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 25 Jul 2010 21:44:29 +0000
Subject: [PATCH] More unused variables, whitespace

---
 includes/ChangeTags.php                     | 1 -
 includes/RevisionDelete.php                 | 2 +-
 includes/UserMailer.php                     | 2 --
 includes/media/GIF.php                      | 4 ++--
 includes/specials/SpecialMovepage.php       | 2 +-
 includes/specials/SpecialRevisiondelete.php | 2 --
 includes/specials/SpecialTags.php           | 3 +--
 maintenance/populateLogUsertext.php         | 2 +-
 maintenance/populateSha1.php                | 3 +--
 maintenance/storage/moveToExternal.php      | 3 +--
 maintenance/storage/orphanStats.php         | 1 -
 maintenance/tests/ApiTest.php               | 3 ---
 skins/Vector.php                            | 1 -
 13 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 3589560b6e..58f56efbc2 100644
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -119,7 +119,6 @@ class ChangeTags {
 		}
 
 		// Figure out which conditions can be done.
-		$join_field = '';
 		if ( in_array( 'recentchanges', $tables ) ) {
 			$join_cond = 'rc_id';
 		} elseif( in_array( 'logging', $tables ) ) {
diff --git a/includes/RevisionDelete.php b/includes/RevisionDelete.php
index 7a540a0719..8dfecc3232 100644
--- a/includes/RevisionDelete.php
+++ b/includes/RevisionDelete.php
@@ -150,7 +150,7 @@ class RevisionDeleter {
 			$originalKey = $key = $paramArray[0];
 			// $paramArray[1] is a CSV of the IDs
 			$Ids = explode( ',', $paramArray[1] );
-			$query = $paramArray[1];
+
 			$revert = array();
 			
 			// For if undeleted revisions are found amidst deleted ones.
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 14470454c2..fec7c6e79a 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -367,8 +367,6 @@ class EmailNotification {
 		# 2. minor edits (changes) are only regarded if the global flag indicates so
 
 		$isUserTalkPage = ($title->getNamespace() == NS_USER_TALK);
-		$enotifusertalkpage = ($isUserTalkPage && $wgEnotifUserTalk);
-		$enotifwatchlistpage = $wgEnotifWatchlist;
 
 		$this->title = $title;
 		$this->timestamp = $timestamp;
diff --git a/includes/media/GIF.php b/includes/media/GIF.php
index 4679963fb5..ed3facba64 100644
--- a/includes/media/GIF.php
+++ b/includes/media/GIF.php
@@ -61,8 +61,8 @@ class GIFHandler extends BitmapHandler {
 	}
 
 	function getLongDesc( $image ) {
-		global $wgUser, $wgLang;
-		$sk = $wgUser->getSkin();
+		global $wgLang;
+
 		$original = parent::getLongDesc( $image );
 
 		wfSuppressWarnings();
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 450c210975..2f78b53c24 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -82,7 +82,7 @@ class MovePageForm {
 
 	function __construct( $oldTitle, $newTitle ) {
 		global $wgRequest, $wgUser;
-		$target = isset($par) ? $par : $wgRequest->getVal( 'target' );
+
 		$this->oldTitle = $oldTitle;
 		$this->newTitle = $newTitle;
 		$this->reason = $wgRequest->getText( 'wpReason' );
diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index 4df058724d..cad4a0b848 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -351,8 +351,6 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
 
 		$wgOut->addHTML( "<ul>" );
 
-		$where = $revObjs = array();
-		
 		$numRevisions = 0;
 		// Live revisions...
 		$list = $this->getList();
diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php
index c0344297bb..d1fa426a06 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -27,11 +27,10 @@ class SpecialTags extends SpecialPage {
 	}
 
 	function execute( $par ) {
-		global $wgOut, $wgUser, $wgMessageCache;
+		global $wgOut, $wgMessageCache;
 
 		$wgMessageCache->loadAllMessages();
 
-		$sk = $wgUser->getSkin();
 		$wgOut->setPageTitle( wfMsg( 'tags-title' ) );
 		$wgOut->wrapWikiMsg( "<div class='mw-tags-intro'>\n$1\n</div>", 'tags-intro' );
 
diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php
index d1e6bf5503..d3b1dd5cec 100644
--- a/maintenance/populateLogUsertext.php
+++ b/maintenance/populateLogUsertext.php
@@ -50,7 +50,7 @@ class PopulateLogUsertext extends Maintenance {
 			$cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id";
 			$res = $db->select( array( 'logging', 'user' ),
 				array( 'log_id', 'user_name' ), $cond, __METHOD__ );
-			$batch = array();
+
 			$db->begin();
 			foreach ( $res as $row ) {
 				$db->update( 'logging', array( 'log_user_text' => $row->user_name ),
diff --git a/maintenance/populateSha1.php b/maintenance/populateSha1.php
index a54d1a43d2..02707ffe08 100644
--- a/maintenance/populateSha1.php
+++ b/maintenance/populateSha1.php
@@ -53,8 +53,7 @@ class PopulateSha1 extends Maintenance {
 		}
 		$imageTable = $dbw->tableName( 'image' );
 		$oldimageTable = $dbw->tableName( 'oldimage' );
-		$batch = array();
-	
+
 		if ( $method == 'pipe' ) {
 			// @fixme kill this and replace with a second unbuffered DB connection.
 			global $wgDBuser, $wgDBserver, $wgDBpassword, $wgDBname;
diff --git a/maintenance/storage/moveToExternal.php b/maintenance/storage/moveToExternal.php
index d595aa8710..c2ed85bc19 100644
--- a/maintenance/storage/moveToExternal.php
+++ b/maintenance/storage/moveToExternal.php
@@ -48,8 +48,7 @@ function moveToExternal( $cluster, $maxID, $minID = 1 ) {
 	print "Moving text rows from $minID to $maxID to external storage\n";
 	$ext = new ExternalStoreDB;
 	$numMoved = 0;
-	$numStubs = 0;
-	
+
 	for ( $block = 0; $block < $numBlocks; $block++ ) {
 		$blockStart = $block * $blockSize + $minID;
 		$blockEnd = $blockStart + $blockSize - 1;
diff --git a/maintenance/storage/orphanStats.php b/maintenance/storage/orphanStats.php
index b3f12d0c03..e371dbc021 100644
--- a/maintenance/storage/orphanStats.php
+++ b/maintenance/storage/orphanStats.php
@@ -34,7 +34,6 @@ class OrphanStats extends Maintenance {
 	}
 
 	public function execute() {
-		$extDBs = array();
 		$dbr = wfGetDB( DB_SLAVE );
 		if ( !$dbr->tableExists( 'blob_orphans' ) ) {
 			$this->error( "blob_orphans doesn't seem to exist, need to run trackBlobs.php first", true );
diff --git a/maintenance/tests/ApiTest.php b/maintenance/tests/ApiTest.php
index ef6f141b4c..d8fc49d08a 100644
--- a/maintenance/tests/ApiTest.php
+++ b/maintenance/tests/ApiTest.php
@@ -13,11 +13,8 @@ class MockApi extends ApiBase {
 			'sessionkey' => null,
 		);
 	}
-
-
 }
 
-
 class ApiTest extends ApiTestSetup {
 
 	function setup() {
diff --git a/skins/Vector.php b/skins/Vector.php
index 6ce5b9a60c..3479ba58f7 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -103,7 +103,6 @@ class SkinVector extends SkinTemplate {
 			} else {
 				$talkId = "{$subjectId}_talk";
 			}
-			$currentId = $isTalk ? $talkId : $subjectId;
 
 			// Adds namespace links
 			$links['namespaces'][$subjectId] = $this->tabAction(
-- 
2.20.1