From d4db109e421eedb28d0d6145c8487e15c23ae9fd Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Thu, 16 Mar 2006 15:32:44 +0000
Subject: #54019, Can't set classes on submit elements, patch by m3avrck

---
 includes/form.inc | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/form.inc b/includes/form.inc
index b0345d638..ad67fd824 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -856,7 +856,15 @@ function theme_submit($element) {
 }
 
 function theme_button($element) {
-  return '<input type="submit" class="form-'. $element['#button_type'] .'" '. (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ') .'value="'. check_plain($element['#value']) .'" '. drupal_attributes($element['#attributes']) ." />\n";
+  //Make sure not to overwrite classes
+  if (isset($element['#attributes']['class'])) {
+    $element['#attributes']['class'] = 'form-'. $element['#button_type'] .' '. $element['#attributes']['class'];
+  }
+  else {
+    $element['#attributes']['class'] = 'form-'. $element['#button_type'];
+  }
+  
+  return '<input type="submit" '. (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ') .'value="'. check_plain($element['#value']) .'" '. drupal_attributes($element['#attributes']) ." />\n";
 }
 
 /**
-- 
cgit v1.2.3