Issue #1027184 by Aron Novak: Expose file download URL as a token.

[project/filefield.git] / filefield_field.inc

diff --git a/filefield_field.inc b/filefield_field.inc
index b0044f1..1917644 100644 (file)
--- a/filefield_field.inc
+++ b/filefield_field.inc
@@ -1,5 +1,4 @@
 <?php
-// $Id$
 
 /**
  * @file
@@ -19,7 +18,7 @@ function filefield_field_settings_form($field) {
     '#title' => t('List field'),
     '#options' => array(0 => t('Disabled'), 1 => t('Enabled')),
     '#default_value' => $field['list_field'] === '' ? 0 : (int) $field['list_field'],
-    '#description' => t('The "list" option lets a user choose if a file should be shown in a list when viewing the content after creation.'),
+    '#description' => t('Display a checkbox where users may choose if a file should be shown when viewing the content. Most formatters other than <em>Generic file</em> do not support this option.'),
     '#attributes' => array('class' => 'filefield-list-field'),
   );
   $form['list_default'] = array(
@@ -32,7 +31,7 @@ function filefield_field_settings_form($field) {
     '#title' => t('Description field'),
     '#default_value' => $field['description_field'] === '' ? 0 : (int) $field['description_field'],
     '#options' => array(0 => t('Disabled'), 1 => t('Enabled')),
-    '#description' => t('When enabled, will display a text field where users may enter a description about the uploaded file.'),
+    '#description' => t('Display a text field where users may enter a description about the uploaded file. The description text is used when using the <em>Generic file</em> formatter to link to the file, the file name will be used otherwise. Most other formatters do not use the description field on output.'),
   );
 
   return $form;
@@ -86,6 +85,7 @@ function filefield_field_settings_views_data($field) {
   $data[$table_alias][$field['field_name'] .'_data']['field'] = array(
     'title' => $data[$table_alias][$field['field_name'] .'_data']['title'],
     'title short' => $data[$table_alias][$field['field_name'] .'_data']['title short'],
+    'help' => t('Can be used to display specific alt, title, or description information. May cause duplicate rows if grouping fields.'),
     'field' => $db_info['columns']['data']['column'],
     'table' => $db_info['table'],
     'handler' => 'filefield_handler_field_data',
@@ -144,9 +144,9 @@ function filefield_field_load($node, $field, &$items, $teaser, $page) {
       }
       // Merge any data added by modules in hook_file_load().
       if (isset($file['data']) && isset($item['data'])) {
-        $file['data'] = array_merge((array) $item['data'], (array) $file['data']);
+        $file['data'] = array_merge((array) $file['data'], (array) $item['data']);
       }
-      $items[$delta] = array_merge($item, $file);
+      $items[$delta] = array_merge($file, $item);
     }
   }
 
@@ -226,6 +226,17 @@ function filefield_field_delete($node, $field, &$items, $teaser, $page) {
     $item['delete_nid'] = $node->nid;
     filefield_field_delete_file($item, $field);
   }
+
+  // Delete all the remaining items present only in older revisions.
+  $db_info = content_database_info($field);
+  $result = db_query('SELECT vid, f.* FROM {' . $db_info['table'] . '} t INNER JOIN {files} f ON t.' . $db_info['columns']['fid']['column'] . ' = f.fid WHERE nid = %d AND vid != %d', $node->nid, $node->vid);
+  while ($item = db_fetch_array($result)) {
+    if (isset($item['fid'])) {
+      $item['field_name'] = $field['field_name'];
+      $item['delete_vid'] = $item['vid'];
+      filefield_field_delete_file($item, $field); 
+    }
+  }
 }
 
 /**
@@ -289,9 +300,9 @@ function filefield_field_sanitize($node, $field, &$items, $teaser, $page) {
     if (!empty($item['fid']) && empty($item['filepath'])) {
       $file = (array) field_file_load($item['fid']);
       if (isset($file['data'])) {
-        $file['data'] = array_merge($items[$delta]['data'], $file['data']);
+        $file['data'] = array_merge($file['data'], $items[$delta]['data']);
       }
-      $items[$delta] = array_merge($items[$delta], $file);
+      $items[$delta] = array_merge($file, $items[$delta]);
     }
 
     // Verify the file exists on the server.