dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9ede7aa)
Remove unused global declarations
authorumherirrender <umherirrender_de.wp@web.de>
Sat, 19 Jul 2014 20:44:54 +0000 (22:44 +0200)
committerumherirrender <umherirrender_de.wp@web.de>
Sat, 19 Jul 2014 20:44:54 +0000 (22:44 +0200)
Change-Id: I05a9bc5c0c0447c045714a445b0ed44f001db1dc

includes/OutputPage.php patch | blob | history
includes/Preferences.php patch | blob | history
includes/Skin.php patch | blob | history
includes/SkinTemplate.php patch | blob | history
includes/installer/WebInstallerOutput.php patch | blob | history

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6163a8d..fdf8e7f 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2961,7 +2961,7 @@ $templates
         * @return string
         */
        function getScriptsForBottomQueue( $inHead ) {
-               global $wgUseSiteJs, $wgAllowUserJs;
+               global $wgAllowUserJs;
 
                // Scripts and messages "only" requests marked for bottom inclusion
                // If we're in the <head>, use load() calls rather than <script src="..."> tags
@@ -3524,7 +3524,7 @@ $templates
         * @return string
         */
        public function buildCssLinks() {
-               global $wgUseSiteCss, $wgAllowUserCss, $wgAllowUserCssPrefs, $wgContLang;
+               global $wgAllowUserCss, $wgContLang;
 
                $this->getSkin()->setupSkinUserCss( $this );
 
diff --git a/includes/Preferences.php b/includes/Preferences.php
index fdb1a9d..482c24b 100644 (file)
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -207,7 +207,7 @@ class Preferences {
         * @return void
         */
        static function profilePreferences( $user, IContextSource $context, &$defaultPreferences ) {
-               global $wgAuth, $wgContLang, $wgParser, $wgCookieExpiration, $wgLanguageCode,
+               global $wgAuth, $wgContLang, $wgParser, $wgLanguageCode,
                        $wgDisableLangConversion, $wgMaxSigChars,
                        $wgEnableEmail, $wgEmailConfirmToEdit, $wgEnableUserEmail, $wgEmailAuthentication,
                        $wgEnotifWatchlist, $wgEnotifUserTalk, $wgEnotifRevealEditorAddress,
diff --git a/includes/Skin.php b/includes/Skin.php
index 35e1ef8..f493b7b 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -815,7 +815,7 @@ abstract class Skin extends ContextSource {
         * @return string
         */
        function getCopyright( $type = 'detect' ) {
-               global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgContLang;
+               global $wgRightsPage, $wgRightsUrl, $wgRightsText;
 
                if ( $type == 'detect' ) {
                        if ( !$this->isRevisionCurrent()
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index faf71aa..bcd3532 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -294,8 +294,7 @@ class SkinTemplate extends Skin {
         * @return QuickTemplate The template to be executed by outputPage
         */
        protected function prepareQuickTemplate() {
-               global $wgContLang, $wgScript, $wgStylePath,
-                       $wgMimeType, $wgJsMimeType, $wgXhtmlNamespaces, $wgHtml5Version,
+               global $wgContLang, $wgScript, $wgStylePath, $wgMimeType, $wgJsMimeType,
                        $wgDisableCounters, $wgSitename, $wgLogo, $wgMaxCredits,
                        $wgShowCreditsIfMax, $wgPageShowWatchingUsers, $wgArticlePath,
                        $wgScriptPath, $wgServer;
diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 97f4830..174120f 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -126,7 +126,6 @@ class WebInstallerOutput {
        public function getCSS() {
                // Horrible, horrible hack: the installer is currently hardcoded to use the Vector skin, so load
                // it here. Include instead of require, as this will work without it, it will just look bad.
-               global $wgResourceModules;
                global $wgStyleDirectory;
                include_once "$wgStyleDirectory/Vector/Vector.php";
 
Wiklou, le Wiki du Wiklou