summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content.module9
-rw-r--r--content_admin.inc2
2 files changed, 3 insertions, 8 deletions
diff --git a/content.module b/content.module
index 99de3ea..88f2cd8 100644
--- a/content.module
+++ b/content.module
@@ -973,13 +973,8 @@ function content_format($field, $item, $formatter = 'default', $node = NULL) {
* An HTML string containing the fully themed field.
*/
function theme_field(&$node, &$field, &$items, $teaser, $page) {
- if (isset($field['display_settings']['label']['format'])) {
- $label = $field['display_settings']['label']['format'] ? $field['display_settings']['label']['format'] : 'header';
- }
- else {
- $label = '';
- }
-
+ $label = isset($field['display_settings']['label']['format']) ? $field['display_settings']['label']['format'] : 'above';
+
$items_output = '';
foreach ($items as $delta => $item) {
if (!empty($item['view']) || $item['view'] === "0") {
diff --git a/content_admin.inc b/content_admin.inc
index b1ec9e9..a8d0fc9 100644
--- a/content_admin.inc
+++ b/content_admin.inc
@@ -585,7 +585,7 @@ function content_admin_display_overview_form_submit($form_id, $form_values) {
db_query("UPDATE {node_field_instance} SET display_settings = '%s' WHERE type_name = '%s' AND field_name = '%s'",
serialize($display_settings), $form_values['type_name'], $fieldname);
}
- drupal_set_message(t('Updated display settings.'));
+ drupal_set_message(t('Your settings have been saved.'));
content_clear_type_cache();
}