summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-13 05:00:25 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-01-13 05:00:25 +0000
commit3a0f6b33720b1a939ec2f828bfefd31b6c51817f (patch)
tree89502c07e46b8eb5367aa880c74a15204c95c2cc /modules/user
parent52f99dc071428a1490d0d367e95706a65f5b3d17 (diff)
downloadbrdo-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/user')
-rw-r--r--modules/user/user.module1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index 8db32ccd6..313ff34a4 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -2158,6 +2158,7 @@ function user_build_content($account, $view_mode = 'full') {
// Build fields content.
field_attach_prepare_view('user', array($account->uid => $account), $view_mode);
+ entity_prepare_view('user', array($account->uid => $account));
$account->content += field_attach_view('user', $account, $view_mode);
// Populate $account->content with a render() array.