diff --git a/filefield.module b/filefield.module index 976544b..c199990 100644 --- a/filefield.module +++ b/filefield.module @@ -545,22 +545,14 @@ function filefield_filefield_icon_sets() { * us to check, so we can make sure that the user may actually edit the file. */ function filefield_edit_access($type_name, $field_name, $node = NULL) { - if (!content_access('edit', content_fields($field_name, $type_name), NULL, $node)) { - return FALSE; - } - // No content permissions to check, so let's fall back to a more general permission. - return user_access('access content') || user_access('administer nodes'); + return content_access('edit', content_fields($field_name, $type_name), NULL, $node); } /** * Access callback that checks if the current user may view the filefield. */ function filefield_view_access($field_name, $node = NULL) { - if (!content_access('view', content_fields($field_name), NULL, $node)) { - return FALSE; - } - // No content permissions to check, so let's fall back to a more general permission. - return user_access('access content') || user_access('administer nodes'); + return content_access('view', content_fields($field_name), NULL, $node); } /**