From: Sam Reed <reedy@users.mediawiki.org>
Date: Thu, 19 Aug 2010 11:42:06 +0000 (+0000)
Subject: More unused....
X-Git-Tag: 1.31.0-rc.0~35443
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=88403ed2c564bcd168d8b3b0d0dd9dbd815e94e5;p=lhc%2Fweb%2Fwiklou.git

More unused....
---

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index be11821c21..ddbad63a5d 100644
--- 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 619c1011fb..a0971fcdb2 100644
--- 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 c91dc86833..f43c61499e 100644
--- 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 e3707ff1ed..7eeded3806 100644
--- 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 7d4b03f3ad..48d702ed9f 100644
--- 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 1d870ef7bc..6daf63d8ba 100644
--- 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 e8ae4c35f8..56e7aea59b 100644
--- 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: