tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Ensure merging correctly

Browse Source
This commit is contained in:
Sean Harvey 2012-04-19 14:26:03 +12:00
parent 23c3fb83fb
commit 80facbd81b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
forms/EmailField.php
View File

@ -11,11 +11,12 @@ class EmailField extends TextField {
} }
function getAttributes() { function getAttributes() {
$attrs = array( return array_merge(
'type' => 'email', parent::getAttributes(),
array(
'type' => 'email'
)
); );
return array_merge($attrs, $this->attributes);
} }
/** /**