From 9d36466446ec912a75a575f804de2d0a80d71c5e Mon Sep 17 00:00:00 2001 From: Lars Lenecke Date: Tue, 8 Oct 2013 16:44:48 +0200 Subject: [PATCH] Fixed occasionally watchdog notice in user module --- modules/user/user.module | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/user/user.module b/modules/user/user.module index 5124207..f62976c 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -3630,9 +3630,15 @@ function user_node_load($nodes, $types) { // Add these values back into the node objects. foreach ($uids as $nid => $uid) { - $nodes[$nid]->name = $user_fields[$uid]->name; - $nodes[$nid]->picture = $user_fields[$uid]->picture; - $nodes[$nid]->data = $user_fields[$uid]->data; + // If no user fields exist, we set everything to NULL + if(!isset($user_fields[$uid])){ + $nodes[$nid]->name = $nodes[$nid]->picture = $nodes[$nid]->data = NULL; + } + else{ + $nodes[$nid]->name = $user_fields[$uid]->name; + $nodes[$nid]->picture = $user_fields[$uid]->picture; + $nodes[$nid]->data = $user_fields[$uid]->data; + } } } -- 1.8.3.4 (Apple Git-47)