From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 18 Jul 2011 13:14:05 +0000 (+0000)
Subject: Kill unused globals
X-Git-Tag: 1.31.0-rc.0~28777
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=5c134b562ccded409b674d7104ab510415ba79b5;p=lhc%2Fweb%2Fwiklou.git

Kill unused globals

Remove unreachable return;
---

diff --git a/includes/specials/SpecialLockdb.php b/includes/specials/SpecialLockdb.php
index 4c70df23f4..5c861b3191 100644
--- a/includes/specials/SpecialLockdb.php
+++ b/includes/specials/SpecialLockdb.php
@@ -34,7 +34,7 @@ class SpecialLockdb extends SpecialPage {
 	}
 
 	public function execute( $par ) {
-		global $wgUser, $wgOut, $wgRequest;
+		global $wgUser, $wgRequest;
 
 		$this->setHeaders();
 
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 11095fba58..e768255f5f 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -579,7 +579,7 @@ class MovePageForm extends UnlistedSpecialPage {
 	}
 
 	function showSubpages( $title, $out ) {
-		global $wgUser, $wgLang;
+		global $wgLang;
 
 		if( !MWNamespace::hasSubpages( $title->getNamespace() ) )
 			return;
diff --git a/includes/specials/SpecialPasswordReset.php b/includes/specials/SpecialPasswordReset.php
index 191832b69b..7a29e6d609 100644
--- a/includes/specials/SpecialPasswordReset.php
+++ b/includes/specials/SpecialPasswordReset.php
@@ -33,8 +33,6 @@ class SpecialPasswordReset extends FormSpecialPage {
 	}
 
 	public function userCanExecute( User $user ) {
-		global $wgPasswordResetRoutes, $wgAuth;
-
 		$error = $this->canChangePassword( $user );
 		if ( is_string( $error ) ) {
 			throw new ErrorPageError( 'internalerror', $error );
@@ -243,7 +241,7 @@ class SpecialPasswordReset extends FormSpecialPage {
 	 * @return Bool
 	 */
 	function isListed() {
-		global $wgPasswordResetRoutes, $wgAuth, $wgUser;
+		global $wgUser;
 
 		if ( $this->canChangePassword( $wgUser ) === true ) {
 			return parent::isListed();
diff --git a/includes/specials/SpecialUnblock.php b/includes/specials/SpecialUnblock.php
index 0d93958393..82435829bd 100644
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -46,7 +46,6 @@ class SpecialUnblock extends SpecialPage {
 		# Check for database lock
 		if( wfReadOnly() ) {
 			throw new ReadOnlyError;
-			return;
 		}
 
 		list( $this->target, $this->type ) = SpecialBlock::getTargetAndType( $par, $wgRequest );
diff --git a/includes/specials/SpecialUploadStash.php b/includes/specials/SpecialUploadStash.php
index 59541c1ed9..eae6265e62 100644
--- a/includes/specials/SpecialUploadStash.php
+++ b/includes/specials/SpecialUploadStash.php
@@ -333,7 +333,6 @@ class SpecialUploadStash extends UnlistedSpecialPage {
 		$form->prepareForm();
 		$formResult = $form->tryAuthorizedSubmit();
 
-
 		// show the files + form, if there are any, or just say there are none
 		$refreshHtml = Html::element( 'a',
 			array( 'href' => $this->getTitle()->getLocalURL() ),