Cleanup a few unused globals

diff --git a/img_auth.php b/img_auth.php
index 7b09eb6..3999bf3 100644 (file)
--- a/img_auth.php
+++ b/img_auth.php
@@ -43,7 +43,7 @@ wfImageAuthMain();
 wfLogProfilingData();
 
 function wfImageAuthMain() {
-       global $wgImgAuthPublicTest, $wgRequest, $wgUploadDirectory;
+       global $wgImgAuthPublicTest, $wgRequest;
 
        // See if this is a public Wiki (no protections).
        if ( $wgImgAuthPublicTest

diff --git a/includes/filerepo/backend/FileBackend.php b/includes/filerepo/backend/FileBackend.php
index 1904e01..e546c96 100644 (file)
--- a/includes/filerepo/backend/FileBackend.php
+++ b/includes/filerepo/backend/FileBackend.php
@@ -1127,7 +1127,7 @@ abstract class FileBackendStore extends FileBackend {
 
        /**
         * @see FileBackend::getFileStat()
-        * @return bool|void
+        * @return bool
         */
        final public function getFileStat( array $params ) {
                wfProfileIn( __METHOD__ );

diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php
index 0fbe887..cddfe01 100644 (file)
--- a/includes/specials/SpecialListusers.php
+++ b/includes/specials/SpecialListusers.php
@@ -157,7 +157,6 @@ class UsersPager extends AlphabeticPager {
                        $edits = '';
                }
 
-               global $wgLang;
                $userTalkPage = $userPage->getTalkPage();
                $talk = ' (' . Linker::link( $userTalkPage, wfMessage( 'talkpagelinktext' )->escaped() ) . ')';
 

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 5d1370d..56217b3 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -383,7 +383,7 @@ class MovePageForm extends UnlistedSpecialPage {
        }
 
        function doSubmit() {
-               global $wgMaximumMovedPages, $wgFixDoubleRedirects, $wgDeleteRevisionsLimit;
+               global $wgMaximumMovedPages, $wgFixDoubleRedirects;
 
                $user = $this->getUser();
 

diff --git a/maintenance/protect.php b/maintenance/protect.php
index 56958ea..e772d67 100644 (file)
--- a/maintenance/protect.php
+++ b/maintenance/protect.php
@@ -35,8 +35,6 @@ class Protect extends Maintenance {
        }
 
        public function execute() {
-               global $wgUser;
-
                $userName = $this->getOption( 'u', 'Maintenance script' );
                $reason = $this->getOption( 'r', '' );
 

diff --git a/tests/phpunit/includes/HtmlTest.php b/tests/phpunit/includes/HtmlTest.php
index c3c7646..9e2deb1 100644 (file)
--- a/tests/phpunit/includes/HtmlTest.php
+++ b/tests/phpunit/includes/HtmlTest.php
@@ -214,8 +214,6 @@ class HtmlTest extends MediaWikiTestCase {
        }
 
        function testNamespaceSelector() {
-               global $wgContLang;
-
                $this->assertEquals(
                        '<select id="namespace" name="namespace">' . "\n" .
 '<option value="0">(Main)</option>' . "\n" .