Bunch of globals laying around and nobody using them.

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 33e3bf8..71b4f01 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -699,7 +699,7 @@ class OutputPage {
         * If it does, it's very important that we don't allow public caching
         */
        function haveCacheVaryCookies() {
-               global $wgRequest, $wgCookiePrefix;
+               global $wgRequest;
                $cookieHeader = $wgRequest->getHeader( 'cookie' );
                if ( $cookieHeader === false ) {
                        return false;
@@ -718,7 +718,6 @@ class OutputPage {
 
        /** Get a complete X-Vary-Options header */
        public function getXVO() {
-               global $wgCookiePrefix;
                $cvCookies = $this->getCacheVaryCookies();
                $xvo = 'X-Vary-Options: Accept-Encoding;list-contains=gzip,Cookie;';
                $first = true;

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index e26df31..d77e5c7 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -653,7 +653,6 @@ class LoginForm {
         * @private
         */
        function mailPasswordInternal( $u, $throttle = true, $emailTitle = 'passwordremindertitle', $emailText = 'passwordremindertext' ) {
-               global $wgCookiePath, $wgCookieDomain, $wgCookiePrefix, $wgCookieSecure;
                global $wgServer, $wgScript, $wgUser;
 
                if ( '' == $u->getEmail() ) {
@@ -789,7 +788,7 @@ class LoginForm {
         */
        function mainLoginForm( $msg, $msgtype = 'error' ) {
                global $wgUser, $wgOut, $wgAllowRealName, $wgEnableEmail;
-               global $wgCookiePrefix, $wgAuth, $wgLoginLanguageSelector;
+               global $wgCookiePrefix, $wgLoginLanguageSelector;
                global $wgAuth, $wgEmailConfirmToEdit, $wgCookieExpiration;
                
                $titleObj = SpecialPage::getTitleFor( 'Userlogin' );