diff options
| -rw-r--r-- | modules/field/field.attach.inc | 40 | ||||
| -rw-r--r-- | modules/node/node.module | 7 | ||||
| -rw-r--r-- | modules/rdf/rdf.module | 6 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.module | 6 |
4 files changed, 41 insertions, 18 deletions
diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc index 8ec1786f1..373e8c51d 100644 --- a/modules/field/field.attach.inc +++ b/modules/field/field.attach.inc @@ -1111,15 +1111,41 @@ function field_attach_query_revisions($field_id, $conditions, $options = array() } /** - * Allow formatters to act on fieldable objects prior to rendering. + * Prepare field data prior to display. + * + * This function must be called before field_attach_view(). It lets field + * types and formatters load additional data needed for display, and + * therefore accepts an array of objects to allow query optimisation when + * displaying lists of objects. + * + * @param $obj_type + * The type of $objects; e.g. 'node' or 'user'. + * @param $objects + * An array of objects, keyed by object id. + * @param $view_mode + * View mode, e.g. 'full', 'teaser'... */ function field_attach_prepare_view($obj_type, $objects, $view_mode = 'full') { + // To ensure hooks are only run once per entity, only process items without + // the _field_view_prepared flag. + // @todo: resolve this more generally for both entity and field level hooks. + $prepare = array(); + foreach ($objects as $id => $object) { + if (empty($object->_field_view_prepared)) { + // Add this entity to the items to be prepared. + $prepare[$id] = $object; + + // Mark this item as prepared. + $object->_field_view_prepared = TRUE; + } + } + // First let the field types do their preparation. - _field_invoke_multiple('prepare_view', $obj_type, $objects); + _field_invoke_multiple('prepare_view', $obj_type, $prepare); // Then let the formatters do their own specific massaging. // field_default_prepare_view() takes care of dispatching to the correct // formatters according to the display settings for the view mode. - _field_invoke_multiple_default('prepare_view', $obj_type, $objects, $view_mode); + _field_invoke_multiple_default('prepare_view', $obj_type, $prepare, $view_mode); } /** @@ -1128,6 +1154,9 @@ function field_attach_prepare_view($obj_type, $objects, $view_mode = 'full') { * Each field is displayed according to the display options specified in the * $instance definition for the given $view_mode. * + * The object must have run through field_attach_prepare_view() beforehands. + * @see field_attach_prepare_view() + * * Sample structure: * @code * array( @@ -1185,6 +1214,11 @@ function field_attach_view($obj_type, $object, $view_mode = 'full', $langcode = ); drupal_alter('field_attach_view', $output, $context); + // Reset the _field_view_prepared flag set in field_attach_prepare_view(), + // in case the same object is displayed with different settings later in + // the request. + unset($object->_field_view_prepared); + return $output; } diff --git a/modules/node/node.module b/modules/node/node.module index 4f78d271e..ccee7c4fe 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1236,9 +1236,10 @@ function node_build_content($node, $view_mode = 'full') { } // Build fields content. - // @todo field_attach_prepare_view() is only invoked by node_view_multiple(), - // all other entities invoke it _here_. - //field_attach_prepare_view('node', array($node->nid => $node), $view_mode); + // In case of a multiple view, node_view_multiple() already ran the + // 'prepare_view' step. An internal flag prevents the operation from running + // twice. + field_attach_prepare_view('node', array($node->nid => $node), $view_mode); $node->content += field_attach_view('node', $node, $view_mode); // Always display a read more link on teasers because we have no way diff --git a/modules/rdf/rdf.module b/modules/rdf/rdf.module index 2ac831fb3..82216b993 100644 --- a/modules/rdf/rdf.module +++ b/modules/rdf/rdf.module @@ -582,12 +582,6 @@ function rdf_field_attach_view_alter(&$output, $context) { $element = &$output[$field_name]; if ($element['#field_type'] == 'taxonomy_term' && $element['#formatter'] == 'taxonomy_term_link') { foreach ($element['#items'] as $delta => $item) { - // @todo Remove this when "node_view() does not call - // field_attach_prepare_view()" bug is fixed. - // See http://drupal.org/node/493314. - if (!isset($item['taxonomy_term'])) { - $item['taxonomy_term'] = taxonomy_term_load($item['tid']); - } $term = $item['taxonomy_term']; if (!empty($term->rdf_mapping['rdftype'])) { $element[$delta]['#options']['attributes']['typeof'] = $term->rdf_mapping['rdftype']; diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 5c63fc057..68bc50687 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -1079,12 +1079,6 @@ function taxonomy_field_formatter_view($object_type, $object, $field, $instance, switch ($display['type']) { case 'taxonomy_term_link': foreach ($items as $delta => $item) { - // @todo Remove this when "node_view() does not call - // field_attach_prepare_view()" bug is fixed. - // See http://drupal.org/node/493314. - if (!isset($item['taxonomy_term'])) { - $item['taxonomy_term'] = taxonomy_term_load($item['tid']); - } $term = $item['taxonomy_term']; $element[$delta] = array( '#type' => 'link', |