From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 18 Nov 2008 21:37:11 +0000 (+0000)
Subject: Bunch of globals laying around and nobody using them.
X-Git-Tag: 1.31.0-rc.0~44277
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=c875996c576c3d94e1e2ef4cf2fdbdc270e83a08;p=lhc%2Fweb%2Fwiklou.git

Bunch of globals laying around and nobody using them.
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 33e3bf8d9d..71b4f01275 100644
--- 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 e26df312b4..d77e5c7908 100644
--- 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' );