From f5117782ee7d4c05228bff8910cbf29c1b077662 Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Wed, 15 Apr 2009 03:24:17 +0000 Subject: [PATCH] Undoing changeset committed in r74490 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@74501 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/ConfirmedPasswordField.php | 2 -- forms/PasswordField.php | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/forms/ConfirmedPasswordField.php b/forms/ConfirmedPasswordField.php index c74169b28..530e2a732 100644 --- a/forms/ConfirmedPasswordField.php +++ b/forms/ConfirmedPasswordField.php @@ -117,8 +117,6 @@ class ConfirmedPasswordField extends FormField { } foreach($this->children as $field) { - $field->setDisabled($this->isDisabled()); - $field->setReadonly($this->isReadonly()); $content .= $field->FieldHolder(); } diff --git a/forms/PasswordField.php b/forms/PasswordField.php index e02d6e466..2df9000a1 100755 --- a/forms/PasswordField.php +++ b/forms/PasswordField.php @@ -25,15 +25,13 @@ class PasswordField extends FormField { function Field() { - $disabled = $this->isDisabled()?"disabled=\"disabled\"":""; - $readonly = $this->isReadonly()?"readonly=\"readonly\"":""; if($this->maxLength) { return "id() . "\" name=\"{$this->name}\" value=\"" . $this->attrValue() . - "\" maxlength=\"$this->maxLength\" size=\"$this->maxLength\" $disabled $readonly />"; + "\" maxlength=\"$this->maxLength\" size=\"$this->maxLength\"/>"; } else { return "id() . - "\" name=\"{$this->name}\" value=\"" . $this->attrValue() . "\" $disabled $readonly />"; + "\" name=\"{$this->name}\" value=\"" . $this->attrValue() . "\" />"; } }