From 5295157664dfb2221d2a6fffaa1974966f5e49bb Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 29 Feb 2004 09:17:17 +0000
Subject: [PATCH] bug fix

---
 includes/SpecialUserlogin.php | 1 -
 includes/User.php             | 8 +-------
 languages/Language.php        | 9 ---------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/includes/SpecialUserlogin.php b/includes/SpecialUserlogin.php
index 8939700a5f..76f9f13c63 100644
--- a/includes/SpecialUserlogin.php
+++ b/includes/SpecialUserlogin.php
@@ -126,7 +126,6 @@ function wfSpecialUserlogin()
 		mainLoginForm( wfMsg( "userexists" ) );
 		return;
 	}
-	$u->loadDefaultUserOptions();
 	$u->addToDatabase();
 	$u->setPassword( $wpPassword );
 	$u->setEmail( $wpEmail );
diff --git a/includes/User.php b/includes/User.php
index d53e30c012..7a21052abf 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -78,7 +78,7 @@ class User {
 		$this->mEmail = "";
 		$this->mPassword = $this->mNewpassword = "";
 		$this->mRights = array();
-		$defOpt = $wgLang->getDefaultAnonOptions() ;
+		$defOpt = $wgLang->getDefaultUserOptions() ;
 		foreach ( $defOpt as $oname => $val ) {
 			$this->mOptions[$oname] = $val;
 		}
@@ -92,12 +92,6 @@ class User {
 		$this->cookiePassword = "";
 	}
 
-	function loadDefaultUserOptions()
-	{
-		global $wgLang;
-		$this->mOptions = $wgLang->getDefaultUserOptions();
-	}
-
 	/* private */ function getBlockedStatus()
 	{
 		global $wgIP, $wgBlockCache;
diff --git a/languages/Language.php b/languages/Language.php
index cc687acb76..795041a491 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -77,10 +77,6 @@ if($wgMetaNamespace === FALSE)
 	"date" => 0
 );
 
-/* private */ $wgDefaultAnonOptionsEn = array(
-	"editsection" => 0
-);
-
 /* private */ $wgQuickbarSettingsEn = array(
 	"None", "Fixed left", "Fixed right", "Floating left"
 );
@@ -1426,11 +1422,6 @@ class Language {
 		global $wgDefaultUserOptionsEn ;
 		return $wgDefaultUserOptionsEn ;
 	}
-
-	function getDefaultAnonOptions() {
-		global $wgDefaultAnonOptionsEn;
-		return $wgDefaultAnonOptionsEn + $this->getDefaultUserOptions();
-	}
 	
 	function getBookstoreList () {
 		global $wgBookstoreListEn ;
-- 
2.20.1