array_merge() error on first view of a node when no file is uploaded [#88033]

I'm currently using the 1.10 version of filefield. If I create a content type that uses the filefield where the field is optional and then I do not upload a file, the first time that I vew that node I get the error:

warning: array_merge() [function.array-merge]: Argument #2 is not an array in filefield\filefield.module on line 172.

I get one error per field. It seems that the test !empty($file) is insufficient. I tried commenting out some of the print statements and found the following:

loading file form content.module:

Array
(
    [fid] => 0
    [description] => 
    [list] => 0
)

loading file from db:

</pre></li>
  <li>loading file form content.module: <pre>Array
(
    [fid] => 0
    [description] => 
    [list] => 0
)

loading file from db:

Comments

Comment #1

Tyrael commented 20 October 2006 at 12:39

$values[$delta] = array_merge($file, $dbfile);
this is the 172th line.

$dbfile had a false value, because the _filefield_file_load($file['fid']) function return with false

I replaced that line with this:
if(_filefield_file_load($file['fid'])){
$dbfile = _filefield_file_load($file['fid']);
}
else{
$dbfile= array();
}

Now there is no error message, but im not sure about the solution, maybe its just fix the error message, but the $dbfile should have a proper array value.
dunno.

sorry for my bad english

Tyrael