Index: modules/upload/views_handler_field_upload_fid.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/upload/views_handler_field_upload_fid.inc,v
retrieving revision 1.4
diff -u -p -r1.4 views_handler_field_upload_fid.inc
--- modules/upload/views_handler_field_upload_fid.inc	30 Jan 2009 00:01:42 -0000	1.4
+++ modules/upload/views_handler_field_upload_fid.inc	21 Feb 2009 19:35:57 -0000
@@ -19,6 +19,7 @@ class views_handler_field_upload_fid ext
     parent::options_form($form, $form_state);
     $form['link_to_file'] = array(
       '#title' => t('Link this field to download the file'),
+      '#description' => t('This option is incompatible with trimming.'),
       '#type' => 'checkbox',
       '#default_value' => !empty($this->options['link_to_file']),
     );
@@ -58,9 +59,8 @@ class views_handler_field_upload_fid ext
    * Data should be made XSS safe prior to calling this function.
    */
   function render_link($data, $values) {
-    if (!empty($this->options['link_to_file']) && $data !== NULL && $data !== '') {
-      $this->options['alter']['make_link'] = TRUE;
-      $this->options['alter']['path'] = file_create_url($values->filepath);
+    if (!empty($this->options['link_to_file']) && $data !== NULL && $data !== '' && !$this->options['alter']['make_link'] && !$this->options['alter']['trim']) {
+      $data = l($data,file_create_url($values->filepath));
     }
     return $data;
   }