From 253a11aa5b1403f4d452e6b279ad4a22d096e0c1 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 14 Jul 2010 17:28:08 +0000
Subject: [PATCH] Revert r64217 (WikiSysop is back, and now (s)he's
 localisable) per comments on review

---
 includes/installer/Installer.i18n.php | 3 ---
 includes/installer/Installer.php      | 2 +-
 includes/installer/WebInstaller.php   | 4 ----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index a01f5afb7a..13e3eafffc 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -308,7 +308,6 @@ All page titles in this namespace start with a certain prefix, which you can spe
 Traditionally, this prefix is derived from the name of the wiki, but it cannot contain punctuation characters such as "#" or ":".',
 	'config-ns-invalid'               => 'The specified namespace "<nowiki>$1</nowiki>" is invalid.
 Specify a different project namespace',
-	'config-admin-default-username'   => 'WikiSysop',
 	'config-admin-box'                => 'Administrator account',
 	'config-admin-name'               => 'Your name:',
 	'config-admin-password'           => 'Password:',
@@ -669,7 +668,6 @@ Alle paginanamen in deze naamruimte beginnen met een bepaald voorvoegsel dat u h
 Dit voorvoegsel wordt meestal afgeleid van de naam van de wiki, maar het kan geen bijzondere tekens bevatten als \"#\" of \":\".",
 	'config-ns-invalid' => 'De aangegeven naamruimte "<nowiki>$1</nowiki>" is ongeldig.
 Geef een andere naamruimte op.',
-	'config-admin-default-username' => 'WikiBeheerder',
 	'config-admin-box' => 'Beheerdersaccount',
 	'config-admin-name' => 'Uw naam:',
 	'config-admin-password' => 'Wachtwoord:',
@@ -777,5 +775,4 @@ U hebt MediaWiki geïnstalleerd.
 $messages['ru'] = array(
 	'config-title'                  => 'Установка MediaWiki $1',
 	'config-page-language'          => 'Язык',
-	'config-admin-default-username' => 'ВикиАдминистратор',
 );
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 5a725d4f5c..8ef9e7a6e2 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -59,7 +59,7 @@ abstract class Installer {
 		'_SameAccount' => true,
 		'_CreateDBAccount' => false,
 		'_NamespaceType' => 'site-name',
-		'_AdminName' => null, // will be set later, when the user selects language
+		'_AdminName' => '', // will be set later, when the user selects language
 		'_AdminPassword' => '',
 		'_AdminPassword2' => '',
 		'_AdminEmail' => '',
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index e009ad5178..f97b9922e5 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -930,10 +930,6 @@ class WebInstaller_Language extends WebInstallerPage {
 				}
 				if ( isset( $languages[$contLang] ) ) {
 					$this->setVar( 'wgLanguageCode', $contLang );
-					if ( $this->getVar( '_AdminName' ) === null ) {
-						// Load localised sysop username in *content* language
-						$this->setVar( '_AdminName', wfMsgForContent( 'config-admin-default-username' ) );
-					}
 				}
 				return 'continue';
 			}
-- 
2.20.1