Commit 1d19174d authored by KarenS's avatar KarenS

Issue #1063338 by DeFr: Fix undefined indexes for FIELD_NAME_rendered and others.

parent 1aa6c8dc
......@@ -7,6 +7,8 @@ Features
- #1008184 by merlinofchaos, bojanz, dereine, yched: Adapt to Views 3 "semantic views" feature (backwards compatible with Views 2)
Bugfixes:
- #1063338 by DeFr: Fix undefined indexes for FIELD_NAME_rendered and others.
- Fix undefined group name index in fieldgroup_nodeapi.
- #696620 Make sure non-empty descriptions don't run through translator.
- #863226 by KarenS: make sure we have a function that will return inactive instances when other instances of the same field are still active.
- #887742 by yched: fix notices in _content_get_formatter() in some Views
......
......@@ -332,7 +332,8 @@ function content_view(&$node, $teaser = FALSE, $page = FALSE) {
// Merge fields.
$additions = _content_field_invoke_default('view', $node, $teaser, $page);
$node->content = array_merge((array) $node->content, $additions);
$old = isset($node->content) ? (array) $node->content : array();
$node->content = array_merge($old, $additions);
}
/**
......@@ -858,7 +859,7 @@ function content_field($op, &$node, $field, &$items, $teaser, $page) {
case 'preprocess_node':
// Add $FIELD_NAME_rendered variables.
$addition = array();
$addition = array($field['field_name'] .'_rendered' => '');
// The location of the field's rendered output depends on whether the
// field is in a fieldgroup or not.
......@@ -871,7 +872,7 @@ function content_field($op, &$node, $field, &$items, $teaser, $page) {
}
if ($wrapper) {
// '#chilren' is not set if the field is empty.
// '#children' is not set if the field is empty.
$addition[$field['field_name'] .'_rendered'] = isset($wrapper['#children']) ? $wrapper['#children'] : '';
}
......
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