From 7673e58cd2d3061bb4cc08d2eabcb4b1591faf20 Mon Sep 17 00:00:00 2001
From: andrew morton <drewish@34869.no-reply.drupal.org>
Date: Thu, 30 Jul 2009 16:47:43 +0000
Subject: [PATCH] Fixing some PHP warnings generating tokens.

---
 filefield.token.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/filefield.token.inc b/filefield.token.inc
index 370e87e..97d3f68 100644
--- a/filefield.token.inc
+++ b/filefield.token.inc
@@ -34,7 +34,8 @@ function filefield_token_list($type = 'all') {
  * Provide the token values for a given file item.
  */
 function filefield_token_values($type, $object = NULL) {
-  if ($type == 'field') {
+  $tokens = array();
+  if ($type == 'field' && isset($object[0]['fid'])) {
     $item = $object[0];
     $tokens['filefield-fid']                = $item['fid'];
     $tokens['filefield-description']        = isset($item['data']['description']) ? $item['data']['description'] : '';
@@ -60,6 +61,6 @@ function filefield_token_values($type, $object = NULL) {
       $tokens['filefield-onlyname'] = $info['filename'];
       $tokens['filefield-extension'] = $info['extension'];
     }
-    return $tokens;  
   }
+  return $tokens;  
 }
-- 
1.7.4.1