Bunch of globals laying around and nobody using them.

This commit is contained in:
Chad Horohoe 2008-11-18 21:37:11 +00:00
parent 150cfca00a
commit c875996c57
2 changed files with 2 additions and 4 deletions

View file

@ -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;

View file

@ -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' );