From 7b176bef9dcf653dea7b0d2e5c9de6c257770320 Mon Sep 17 00:00:00 2001
From: Waldir Pimenta <waldir@email.com>
Date: Sun, 26 May 2013 10:41:10 +0100
Subject: [PATCH] Rename variable _AdminPassword2 to _AdminPasswordConfirm for
 clarity

Change-Id: Ica04efb07014d0e7c91ae69c1a7ba5e00c0b16c2
---
 includes/installer/Installer.php        | 2 +-
 includes/installer/WebInstallerPage.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 372091a6c3..85717c5105 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -200,7 +200,7 @@ abstract class Installer {
 		'_NamespaceType' => 'site-name',
 		'_AdminName' => '', // will be set later, when the user selects language
 		'_AdminPassword' => '',
-		'_AdminPassword2' => '',
+		'_AdminPasswordConfirm' => '',
 		'_AdminEmail' => '',
 		'_Subscribe' => false,
 		'_SkipOptional' => 'continue',
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 3b3473b06d..4de7f06cc1 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -790,7 +790,7 @@ class WebInstaller_Name extends WebInstallerPage {
 				'label' => 'config-admin-password',
 			) ) .
 			$this->parent->getPasswordBox( array(
-				'var' => '_AdminPassword2',
+				'var' => '_AdminPasswordConfirm',
 				'label' => 'config-admin-password-confirm'
 			) ) .
 			$this->parent->getTextBox( array(
@@ -829,7 +829,7 @@ class WebInstaller_Name extends WebInstallerPage {
 	public function submit() {
 		$retVal = true;
 		$this->parent->setVarsFromRequest( array( 'wgSitename', '_NamespaceType',
-			'_AdminName', '_AdminPassword', '_AdminPassword2', '_AdminEmail',
+			'_AdminName', '_AdminPassword', '_AdminPasswordConfirm', '_AdminEmail',
 			'_Subscribe', '_SkipOptional', 'wgMetaNamespace' ) );
 
 		// Validate site name
@@ -911,7 +911,7 @@ class WebInstaller_Name extends WebInstallerPage {
 			# $user->getPasswordValidity just checks for $wgMinimalPasswordLength.
 			# This message is more specific and helpful.
 			$msg = 'config-admin-password-blank';
-		} elseif ( $pwd !== $this->getVar( '_AdminPassword2' ) ) {
+		} elseif ( $pwd !== $this->getVar( '_AdminPasswordConfirm' ) ) {
 			$msg = 'config-admin-password-mismatch';
 		} elseif ( $valid !== true ) {
 			$msg = $valid;
@@ -919,7 +919,7 @@ class WebInstaller_Name extends WebInstallerPage {
 		if ( $msg !== false ) {
 			call_user_func_array( array( $this->parent, 'showError' ), (array)$msg );
 			$this->setVar( '_AdminPassword', '' );
-			$this->setVar( '_AdminPassword2', '' );
+			$this->setVar( '_AdminPasswordConfirm', '' );
 			$retVal = false;
 		}
 
-- 
2.20.1