template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/acquia_slate/template.php,v
retrieving revision 1.1.2.4
diff -u -p -r1.1.2.4 template.php
--- template.php	11 May 2009 06:47:19 -0000	1.1.2.4
+++ template.php	11 May 2009 06:51:03 -0000
@@ -663,8 +663,10 @@ function phptemplate_button($element) {
     $element['#attributes']['class'] = 'form-'. $element['#button_type'];
   }
 
-  // Wrap visible inputs with span tags for button graphics
-  if (stristr($element['#attributes']['style'], 'display: none;') || stristr($element['#attributes']['class'], 'fivestar-submit') || ($element['#value'] == 'Upload')) {
+  // Wrap non-hidden input elements with span tags for button graphics
+  if (stristr($element['#attributes']['style'], 'display: none;') || 
+      stristr($element['#attributes']['class'], 'fivestar-submit')  || 
+      is_array($element['#upload_validators'])) {
     return '<input type="submit" '. (empty($element['#name']) ? '' : 'name="'. $element['#name'] .'" ')  .'id="'. $element['#id'].'" value="'. check_plain($element['#value']) .'" '. drupal_attributes($element['#attributes']) ." />\n";
   }
   else {