From 80facbd81bc61484f5fbea79e2c329334e67c414 Mon Sep 17 00:00:00 2001
From: Sean Harvey <sean@silverstripe.com>
Date: Thu, 19 Apr 2012 14:26:03 +1200
Subject: [PATCH] BUGFIX Ensure merging correctly

---
 forms/EmailField.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/forms/EmailField.php b/forms/EmailField.php
index 129bdb2c2..28357de3a 100644
--- a/forms/EmailField.php
+++ b/forms/EmailField.php
@@ -11,11 +11,12 @@ class EmailField extends TextField {
 	}
 
 	function getAttributes() {
-		$attrs = array(
-			'type' => 'email',
+		return array_merge(
+			parent::getAttributes(),
+			array(
+				'type' => 'email'
+			)
 		);
-
-		return array_merge($attrs, $this->attributes);
 	}
 
 	/**