Commit 6fe11608 authored by yched's avatar yched

followup to #107128 : small bug in 4.7 theme_field, + harmonizing UI message

parent dd7868a4
......@@ -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") {
......
......@@ -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();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment