From d05108982ea7878e63ee43b591169981936be1f9 Mon Sep 17 00:00:00 2001 From: Sascha Grossenbacher Date: Mon, 2 May 2011 13:13:41 +0200 Subject: [PATCH] Issue #1108598 by Berdir: Ensured that userpoints_tokens() always passes a real user object forward instead of a entity wrapper object. --- userpoints.module | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/userpoints.module b/userpoints.module index 08e51d4..88a647b 100644 --- a/userpoints.module +++ b/userpoints.module @@ -488,7 +488,6 @@ function userpoints_tokens($type, $tokens, array $data = array(), array $options } if ($type == 'userpoints' && !empty($data['user'])) { - $uid = is_object($data['user']->uid) ? $data['user']->getIdentifier() : $data['user']->uid; foreach ($tokens as $name => $original) { $tid = NULL; if ($name == 'all') { @@ -499,7 +498,7 @@ function userpoints_tokens($type, $tokens, array $data = array(), array $options list(,$tid) = explode('-', $name); } if ($tid) { - $replacements[$original] = userpoints_get_current_points($uid, $tid); + $replacements[$original] = userpoints_get_current_points($user->uid, $tid); } } } @@ -592,7 +591,7 @@ function userpoints_tokens($type, $tokens, array $data = array(), array $options } if ($user_tokens = token_find_with_prefix($tokens, 'user')) { - $replacements += token_generate('user', $user_tokens, array('user' => $txn->user), $options); + $replacements += token_generate('user', $user_tokens, array('user' => user_load($txn->uid)), $options); } if ($term_tokens = token_find_with_prefix($tokens, 'tid')) { -- 1.7.4.1