mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUGFIX: FormAction input tag attributes were being doubly-escaped. (from r100407)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105561 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
ffa1267516
commit
00d19cc3d1
@ -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);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user