More unused variables, whitespace

diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 3589560..58f56ef 100644 (file)
--- 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 7a540a0..8dfecc3 100644 (file)
--- 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 1447045..fec7c6e 100644 (file)
--- 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 4679963..ed3facb 100644 (file)
--- 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 450c210..2f78b53 100644 (file)
--- 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 4df0587..cad4a0b 100644 (file)
--- 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 c034429..d1fa426 100644 (file)
--- 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 d1e6bf5..d3b1dd5 100644 (file)
--- 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 a54d1a4..02707ff 100644 (file)
--- 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 d595aa8..c2ed85b 100644 (file)
--- 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 b3f12d0..e371dbc 100644 (file)
--- 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 ef6f141..d8fc49d 100644 (file)
--- 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 6ce5b9a..3479ba5 100644 (file)
--- 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(