diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-13 05:00:25 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-01-13 05:00:25 +0000 |
| commit | 3a0f6b33720b1a939ec2f828bfefd31b6c51817f (patch) | |
| tree | 89502c07e46b8eb5367aa880c74a15204c95c2cc /modules/node | |
| parent | 52f99dc071428a1490d0d367e95706a65f5b3d17 (diff) | |
| download | brdo-3a0f6b33720b1a939ec2f828bfefd31b6c51817f.tar.gz brdo-3a0f6b33720b1a939ec2f828bfefd31b6c51817f.tar.bz2 | |
#636992 by catch, yched: Fixed Entity loading needs protection from infinite recursion. Prevents unnecessary user_load()s from RDF.
Diffstat (limited to 'modules/node')
| -rw-r--r-- | modules/node/node.module | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/node/node.module b/modules/node/node.module index b56199455..32b107abe 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1209,6 +1209,7 @@ function node_build_content($node, $view_mode = 'full') { // 'prepare_view' step. An internal flag prevents the operation from running // twice. field_attach_prepare_view('node', array($node->nid => $node), $view_mode); + entity_prepare_view('node', array($node->nid => $node)); $node->content += field_attach_view('node', $node, $view_mode); // Always display a read more link on teasers because we have no way @@ -2254,6 +2255,7 @@ function node_feed($nids = FALSE, $channel = array()) { */ function node_view_multiple($nodes, $view_mode = 'teaser', $weight = 0) { field_attach_prepare_view('node', $nodes, $view_mode); + entity_prepare_view('node', $nodes); $build = array(); foreach ($nodes as $node) { $build['nodes'][$node->nid] = node_view($node, $view_mode); |