1 files changed, 20 insertions, 42 deletions
diff --git a/views/default/input/button.php b/views/default/input/button.php
index d6d3aec62..9957fdc54 100644
--- a/views/default/input/button.php
+++ b/views/default/input/button.php
@@ -4,59 +4,37 @@
  *
  * @package Elgg
  * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['value'] The current value, if any
- * @uses $vars['js'] Any Javascript to enter into the input tag
- * @uses $vars['internalname'] The name of the input field
- * @uses $vars['internalid'] The id of the input field
- * @uses $vars['type'] Submit, button, or reset, defaults to submit.
- * @uses $vars['src'] Src of an image
  *
+ * @uses $vars['src']   Src of an image
+ * @uses $vars['class'] Additional CSS class
  */
 
-global $CONFIG;
-
 if (isset($vars['class'])) {
-	$class = $vars['class'];
+	$vars['class'] = "elgg-button {$vars['class']}";
 } else {
-	$class = "submit_button";
+	$vars['class'] = "elgg-button";
 }
 
-// defaults to submit button
-if (isset($vars['type'])) {
-	$type = strtolower($vars['type']);
-} else {
-	$type = 'submit';
-}
+$defaults = array(
+	'type' => 'button',
+);
 
-switch ($type) {
-	case 'button' :
-		$type='button';
-		break;
-	case 'reset' :
-		$type='reset';
-		break;
+$vars = array_merge($defaults, $vars);
+
+switch ($vars['type']) {
+	case 'button':
+	case 'reset':
 	case 'submit':
+	case 'image':
+		break;
 	default:
-		$type = 'submit';
-}
-
-$value = htmlentities($vars['value'], ENT_QUOTES, 'UTF-8');
-
-$name = '';
-if (isset($vars['internalname'])) {
-	$name = $vars['internalname'];
+		$vars['type'] = 'button';
+		break;
 }
 
-$src = '';
-if (isset($vars['src'])) {
-	$src = "src=\"{$vars['src']}\"";
-}
-// blank src if trying to access an offsite image.
-if (strpos($src,$CONFIG->wwwroot)===false) {
-	$src = "";
+// blank src if trying to access an offsite image. @todo why?
+if (isset($vars['src']) && strpos($vars['src'], elgg_get_site_url()) === false) {
+	$vars['src'] = "";
 }
 ?>
-<input name="<?php echo $name; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> type="<?php echo $type; ?>" class="<?php echo $class; ?>" <?php echo $vars['js']; ?> value="<?php echo $value; ?>" <?php echo $src; ?> />
-\ No newline at end of file
+<input <?php echo elgg_format_attributes($vars); ?> />