Remove unused globals.

diff --git a/includes/Title.php b/includes/Title.php
index 517fdea..cec0067 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -863,7 +863,7 @@ class Title {
         */
        public function getLocalURL( $query = '', $variant = false ) {
                global $wgArticlePath, $wgScript, $wgServer, $wgRequest;
-               global $wgVariantArticlePath, $wgContLang, $wgUser;
+               global $wgVariantArticlePath, $wgContLang;
 
                if ( is_array( $query ) ) {
                        $query = wfArrayToCGI( $query );

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 7845f8f..aaced48 100644 (file)
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -179,7 +179,7 @@ class MediaWiki {
         */
        function handleSpecialCases( &$title, &$output, $request ) {
                wfProfileIn( __METHOD__ );
-               global $wgContLang, $wgUser;
+
                $action = $this->getVal( 'Action' );
 
                // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty.

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index c3d53a8..81c0f42 100644 (file)
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -187,7 +187,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
         * @return {string} JavaScript code for $context
         */
        public function getScript( ResourceLoaderContext $context ) {
-               global $wgServer, $wgScriptPath;
+               global $wgServer;
                
                $files = array_merge(
                        $this->scripts,
@@ -432,9 +432,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
         * @param {string} $path File path of script file to read
         * @return {string} CSS data in script file
         */
-       protected function readStyleFile( $path ) {
-               global $wgScriptPath;
-               
+       protected function readStyleFile( $path ) {     
                $style = file_get_contents( $this->getLocalPath( $path ) );
                $dir = $this->getLocalPath( dirname( $path ) );
                $remoteDir = $this->getRemotePath( dirname( $path ) );

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 7561ee2..210e2d1 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -947,7 +947,7 @@ class LoginForm {
                global $wgUser, $wgOut, $wgHiddenPrefs, $wgEnableEmail;
                global $wgRequest, $wgLoginLanguageSelector;
                global $wgAuth, $wgEmailConfirmToEdit, $wgCookieExpiration;
-               global $wgSecureLogin, $wgSecureLoginStickHTTPS;
+               global $wgSecureLogin;
 
                $titleObj = SpecialPage::getTitleFor( 'Userlogin' );