From d18509a3f5f0dc16455257cf459d0de6f81cafd9 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 24 May 2008 01:22:27 +0000 Subject: [PATCH] Merged revisions 54455 via svnmerge from svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq ........ r54455 | gmunn | 2008-05-13 16:55:27 +1200 (Tue, 13 May 2008) | 1 line Password change fix, plus layout issues ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@55072 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/ConfirmedPasswordField.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/forms/ConfirmedPasswordField.php b/forms/ConfirmedPasswordField.php index fab442951..d2689a0b4 100644 --- a/forms/ConfirmedPasswordField.php +++ b/forms/ConfirmedPasswordField.php @@ -134,12 +134,14 @@ class ConfirmedPasswordField extends FormField { if($value['_Password'] || (!$value['_Password'] && !$this->canBeEmpty)) { $this->value = $value['_Password']; } + if(isset($value['_PasswordFieldVisible'])){ + $this->children->fieldByName($this->Name() . '[_PasswordFieldVisible]')->setValue($value['_PasswordFieldVisible']); + } } else { if($value || (!$value && !$this->canBeEmpty)) { $this->value = $value; } } - } function jsValidation() {