Index: filefield_formatter.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield_formatter.inc,v retrieving revision 1.18 diff -u -r1.18 filefield_formatter.inc --- filefield_formatter.inc 17 Jun 2010 19:30:45 -0000 1.18 +++ filefield_formatter.inc 29 Jun 2010 20:20:18 -0000 @@ -90,7 +90,7 @@ * in any case, please use theme('filefield_file') instead. */ function theme_filefield_item($file, $field) { - if (filefield_view_access($field['field_name'], node_load($file['nid'])) && filefield_file_listed($file, $field)) { + if (filefield_view_access($field['field_name']) && filefield_file_listed($file, $field)) { return theme('filefield_file', $file); } return ''; Index: filefield.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/filefield/filefield.module,v retrieving revision 1.222 diff -u -r1.222 filefield.module --- filefield.module 29 Jun 2010 19:27:05 -0000 1.222 +++ filefield.module 29 Jun 2010 20:20:18 -0000 @@ -181,7 +181,7 @@ if (isset($nodes[$content['nid']])) { continue; // Don't check the same node twice. } - if (($node = node_load($content['nid'])) && (node_access('view', $node) && filefield_view_access($field_name, $node))) { + if (($node = node_load($content['nid'])) && (node_access('view', $node) && filefield_view_access($field_name))) { $denied = FALSE; break 2; } @@ -494,8 +494,8 @@ /** * Access callback that checks if the current user may view the filefield. */ -function filefield_view_access($field_name, $node) { - if (!content_access('view', content_fields($field_name, $node->type), NULL, $node)) { +function filefield_view_access($field_name) { + if (!content_access('view', content_fields($field_name))) { return FALSE; } // No content permissions to check, so let's fall back to a more general permission.