Index: components/file.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/components/file.inc,v
retrieving revision 1.17.2.4
diff -u -r1.17.2.4 file.inc
--- components/file.inc	21 Mar 2010 19:41:15 -0000	1.17.2.4
+++ components/file.inc	17 Sep 2010 06:54:27 -0000
@@ -120,6 +120,7 @@
       '#description' => t('Enter the max file size a user may upload (in KB).'),
       '#size' => 10,
       '#weight' => 3,
+      '#field_suffix' => t('KB'),
       '#default_value' => $component['extra']['filtering']['size'],
       '#parents' => array('extra', 'filtering', 'size'),
     );
@@ -129,6 +130,7 @@
       '#default_value' => $component['extra']['savelocation'],
       '#description' => '<div style="display: block">' . t('Webform uploads are always saved in the site files directory. You may optionally specify a subfolder to store your files.') . '</div>',
       '#weight' => 3,
+      '#field_prefix' => file_directory_path() . '/webform/',
       '#element_validate' => array('_webform_edit_file_check_directory'),
       '#after_build' => array('_webform_edit_file_check_directory'),
     );
@@ -270,9 +272,6 @@
 
   $output = drupal_render($form);
 
-  // Prefix the upload location field with the default path for webform.
-  $output = str_replace('Upload Directory: </label>', 'Upload Directory: </label>' . file_directory_path() . '/webform/', $output);
-
   return $output;
 }