From c9aceb01e15b85444dbf4c4623df7d29f0dbfb62 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 4 Apr 2008 23:15:42 +0000
Subject: [PATCH] Merged revisions 47264 via svnmerge from
 svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47264 | ischommer | 2007-12-18 16:57:08 +1300 (Tue, 18 Dec 2007) | 1 line

  setting $title for first sub-field instead of dismissing it
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@52157 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 forms/ConfirmedPasswordField.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/forms/ConfirmedPasswordField.php b/forms/ConfirmedPasswordField.php
index f6d447651..392fec851 100644
--- a/forms/ConfirmedPasswordField.php
+++ b/forms/ConfirmedPasswordField.php
@@ -1,14 +1,9 @@
 <?php
-
-/**
- * @package forms
- * @subpackage fields-formattedinput
- */
-
 /**
  * Shows two password-fields, and checks for matching passwords.
  * Optionally hides the fields by default and shows
  * a link to toggle their visibility.
+ * 
  * @package forms
  * @subpackage fields-formattedinput
  */
@@ -69,7 +64,7 @@ class ConfirmedPasswordField extends FormField {
 	function __construct($name, $title = null, $value = "", $form = null, $showOnClick = false) {
 		// naming with underscores to prevent values from actually being saved somewhere
 		$this->children = new FieldSet(
-			new PasswordField("{$name}[_Password]", _t('Member.PASSWORD')),
+			new PasswordField("{$name}[_Password]", (isset($title)) ? $title : _t('Member.PASSWORD')),
 			new PasswordField("{$name}[_ConfirmPassword]",_t('Member.CONFIRMPASSWORD', 'Confirm Password'))
 		);