Revision: 43685
Author: demon
Date: 2008-11-18 21:37:11 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
Bunch of globals laying around and nobody using them.
Modified Paths:
--------------
trunk/phase3/includes/OutputPage.php
trunk/phase3/includes/specials/SpecialUserlogin.php
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2008-11-18 20:27:47 UTC (rev
43684)
+++ trunk/phase3/includes/OutputPage.php 2008-11-18 21:37:11 UTC (rev
43685)
@@ -699,7 +699,7 @@
* 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 @@
/** 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;
Modified: trunk/phase3/includes/specials/SpecialUserlogin.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUserlogin.php 2008-11-18 20:27:47 UTC
(rev 43684)
+++ trunk/phase3/includes/specials/SpecialUserlogin.php 2008-11-18 21:37:11 UTC
(rev 43685)
@@ -653,7 +653,6 @@
* @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 @@
*/
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' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
