From f5f3f205e97c2a3219897dd14de7d57659ce1181 Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 2 Jul 2011 09:21:30 -0400
Subject: Fixes #3624 input views use class extending rather than overriding

---
 views/default/input/button.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'views/default/input/button.php')

diff --git a/views/default/input/button.php b/views/default/input/button.php
index 3122068ca..c21989919 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -6,20 +6,21 @@
  * @subpackage Core
  *
  * @uses $vars['src']   Src of an image
- * @uses $vars['class'] Class to add to elgg-button
- *
- * @todo Handle classes better
+ * @uses $vars['class'] Additional CSS class
  */
 
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-button {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-button";
+}
+
 $defaults = array(
 	'type' => 'button',
-	'class' => '',
 );
 
 $vars = array_merge($defaults, $vars);
 
-$vars['class'] = trim("elgg-button {$vars['class']}");
-
 switch ($vars['type']) {
 	case 'button':
 	case 'reset':
@@ -36,4 +37,4 @@ if (strpos($vars['src'], elgg_get_site_url()) === false) {
 	$vars['src'] = "";
 }
 ?>
-<input <?php echo elgg_format_attributes($vars); ?> />
\ No newline at end of file
+<input <?php echo elgg_format_attributes($vars); ?> />
-- 
cgit v1.2.3