More unused....

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index be11821..ddbad63 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -253,7 +253,6 @@ class FileDeleteForm {
        private function prepareMessage( $message ) {
                global $wgLang;
                if( $this->oldimage ) {
-                       $url = $this->file->getArchiveUrl( $this->oldimage );
                        return wfMsgExt(
                                "{$message}-old", # To ensure grep will find them: 'filedelete-intro-old', 'filedelete-nofile-old', 'filedelete-success-old'
                                'parse',

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 619c101..a0971fc 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -228,8 +228,6 @@ class QueryPage {
                        return false;
                }
 
-               $querycache = $dbr->tableName( 'querycache' );
-
                if ( $ignoreErrors ) {
                        $ignoreW = $dbw->ignoreErrors( true );
                        $ignoreR = $dbr->ignoreErrors( true );

diff --git a/includes/db/DatabaseIbm_db2.php b/includes/db/DatabaseIbm_db2.php
index c91dc86..f43c614 100644 (file)
--- a/includes/db/DatabaseIbm_db2.php
+++ b/includes/db/DatabaseIbm_db2.php
@@ -1076,10 +1076,8 @@ EOF;
                // assume success
                $res = true;
                // If we are not in a transaction, we need to be for savepoint trickery
-               $didbegin = 0;
                if (! $this->mTrxLevel) {
                        $this->begin();
-                       $didbegin = 1;
                }
 
                $sql = "INSERT INTO $table (" . implode( ',', $keys ) . ') VALUES ';

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index e3707ff..7eeded3 100644 (file)
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -80,7 +80,6 @@ class WebInstaller extends CoreInstaller {
         */
        public $showSessionWarning = false;
 
-       public $helpId = 0;
        public $tabIndex = 1;
 
        public $currentPageName;
@@ -607,7 +606,6 @@ class WebInstaller extends CoreInstaller {
                $args = func_get_args();
                array_shift( $args );
                $args = array_map( 'htmlspecialchars', $args );
-               
                $text = wfMsgReal( $msg, $args, false, false, false );
                $html = $this->parse( $text, true );
 

diff --git a/includes/parser/Parser_LinkHooks.php b/includes/parser/Parser_LinkHooks.php
index 7d4b03f..48d702e 100644 (file)
--- a/includes/parser/Parser_LinkHooks.php
+++ b/includes/parser/Parser_LinkHooks.php
@@ -135,13 +135,7 @@ class Parser_LinkHooks extends Parser
                        wfProfileOut( __METHOD__.'-setup' );
                        throw new MWException( __METHOD__.": \$this->mTitle is null\n" );
                }
-               $nottalk = !$this->mTitle->isTalkPage();
-               
-               if($wgContLang->hasVariants()) {
-                       $selflink = $wgContLang->convertLinkToAllVariants($this->mTitle->getPrefixedText());
-               } else {
-                       $selflink = array($this->mTitle->getPrefixedText());
-               }
+
                wfProfileOut( __METHOD__.'-setup' );
                
                $offset = 0;

diff --git a/maintenance/tests/UploadFromUrlTest.php b/maintenance/tests/UploadFromUrlTest.php
index 1d870ef..6daf63d 100644 (file)
--- a/maintenance/tests/UploadFromUrlTest.php
+++ b/maintenance/tests/UploadFromUrlTest.php
@@ -216,7 +216,7 @@ class UploadFromUrlTest extends ApiTestSetup {
                if ( $t->exists() ) {
                        $file = wfFindFile( $name, array( 'ignoreRedirect' => true ) );
                        $empty = "";
-                       $status = FileDeleteForm::doDelete( $t, $file, $empty, "none", true );
+                       FileDeleteForm::doDelete( $t, $file, $empty, "none", true );
                        $a = new Article ( $t );
                        $a->doDeleteArticle( "testing" );
                }

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index e8ae4c3..56e7aea 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1212,7 +1212,6 @@ function do_postgres_updates() {
        global $wgDatabase, $wgDBmwschema, $wgDBts2schema, $wgDBuser;
 
        # # Gather version numbers in case we need them
-       $version = $wgDatabase->getServerVersion(); # # long string
        $numver = $wgDatabase->numeric_version; # # X.Y e.g. 8.3
 
        # Just in case their LocalSettings.php does not have this: