Index: logging_alerts/emaillog/emaillog.module =================================================================== --- logging_alerts/emaillog/emaillog.module (revision 341) +++ logging_alerts/emaillog/emaillog.module (revision 907) @@ -118,7 +118,31 @@ else { $msg = $log_msg['message']; } - + if(is_object($log_msg['user'])){ + if(isset($log_msg['user']->uid)){ + $uid = $log_msg['user']->uid; + } + else{ + $uid = t('No UID'); + if(function_exists('xdebug_get_function_stack')){ + // UID should not be empty, but at least 0 + $msg .= "\n\n ". t('User-Id was not set, debug stack follows') ."\n" . print_r(xdebug_get_function_stack(), true); + } + } + if(isset($log_msg['user']->name)){ + $name = $log_msg['user']->name; + } + else{ + $name = t('No Username'); + } + } + else{ + $uid = t('No UID'); + $name = t('No Username'); + if(function_exists('xdebug_get_function_stack')){ + $msg .= "\n\n ". t('User object was not set, debug stack follows') ."\n" . print_r(xdebug_get_function_stack(), true); + } + } $message = t($message, array( '@base_url' => $base_url, '@severity' => $log_msg['severity'], @@ -128,8 +152,8 @@ '@ip' => $log_msg['ip'], '@request_uri' => $log_msg['request_uri'], '@referer_uri' => $log_msg['referer'], - '@uid' => $log_msg['user']->uid, - '@name' => $log_msg['user']->name, + '@uid' => $uid, + '@name' => $name, '@link' => strip_tags($log_msg['link']), '@message' => strip_tags($msg), ));