From d9dcc4e8220da8c3d31fc12fe950f30ed0048085 Mon Sep 17 00:00:00 2001 From: Luke Hudson Date: Wed, 3 Mar 2010 04:48:15 +0000 Subject: [PATCH] BUGFIX: FormAction input tag attributes were being doubly-escaped. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100407 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/FormAction.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/forms/FormAction.php b/forms/FormAction.php index a1ef8aa2d..c009eb668 100755 --- a/forms/FormAction.php +++ b/forms/FormAction.php @@ -86,21 +86,21 @@ class FormAction extends FormField { $attributes['class'] = $attributes['class'] . ' disabled'; } - return $this->createTag('button', $attributes, $this->buttonContent ? $this->buttonContent : $this->attrTitle()); + return $this->createTag('button', $attributes, $this->buttonContent ? $this->buttonContent : $this->Title()); } else { $attributes = array( 'class' => 'action' . ($this->extraClass() ? $this->extraClass() : ''), 'id' => $this->id(), 'type' => 'submit', 'name' => $this->action, - 'value' => ($this->dontEscape) ? $this->Title() : $this->attrTitle(), + 'value' => $this->Title(), 'tabindex' => $this->getTabIndex() ); if($this->isReadonly()) { $attributes['disabled'] = 'disabled'; $attributes['class'] = $attributes['class'] . ' disabled'; } - $attributes['title'] = ($this->description) ? $this->description : ($this->dontEscape) ? $this->Title() : $this->attrTitle(); + $attributes['title'] = ($this->description) ? $this->description : $this->Title(); return $this->createTag('input', $attributes); }