diff options
Diffstat (limited to 'modules/file')
-rw-r--r-- | modules/file/file.field.inc | 12 | ||||
-rw-r--r-- | modules/file/tests/file.test | 13 |
2 files changed, 20 insertions, 5 deletions
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc index 7f5906ece..2dbd07d7c 100644 --- a/modules/file/file.field.inc +++ b/modules/file/file.field.inc @@ -970,11 +970,13 @@ function file_field_formatter_view($entity_type, $entity, $field, $instance, $la break; case 'file_table': - // Display all values in a single element.. - $element[0] = array( - '#theme' => 'file_formatter_table', - '#items' => $items, - ); + if (!empty($items)) { + // Display all values in a single element.. + $element[0] = array( + '#theme' => 'file_formatter_table', + '#items' => $items, + ); + } break; } diff --git a/modules/file/tests/file.test b/modules/file/tests/file.test index 59f6e0cb0..82bbcdf88 100644 --- a/modules/file/tests/file.test +++ b/modules/file/tests/file.test @@ -760,6 +760,19 @@ class FileFieldDisplayTestCase extends FileFieldTestCase { $field = field_info_field($field_name); $instance = field_info_instance('node', $field_name, $type_name); + // Create a new node *without* the file field set, and check that the field + // is not shown for each node display. + $node = $this->drupalCreateNode(array('type' => $type_name)); + $file_formatters = array('file_default', 'file_table', 'file_url_plain', 'hidden'); + foreach ($file_formatters as $formatter) { + $edit = array( + "fields[$field_name][type]" => $formatter, + ); + $this->drupalPost("admin/structure/types/manage/$type_name/display", $edit, t('Save')); + $this->drupalGet('node/' . $node->nid); + $this->assertNoText($field_name, t('Field label is hidden when no file attached for formatter %formatter', array('%formatter' => $formatter))); + } + $test_file = $this->getTestFile('text'); // Create a new node with the uploaded file. |