Index: fivestar.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/fivestar/fivestar.module,v retrieving revision 1.13.2.51 diff -u -r1.13.2.51 fivestar.module --- fivestar.module 10 Apr 2009 19:45:06 -0000 1.13.2.51 +++ fivestar.module 11 Apr 2009 05:06:02 -0000 @@ -788,8 +788,8 @@ $votes['count'] = $result; } } - if ($user->uid) { - $user_vote = votingapi_select_votes($criteria += array('uid' => $user->uid)); + if ($uid) { + $user_vote = votingapi_select_votes($criteria += array('uid' => $uid)); if ($user_vote) { $votes['user'] = $user_vote[0]; $votes['user']['function'] = 'user'; @@ -1013,9 +1013,9 @@ $votes = fivestar_get_votes($content_type, $content_id); $values = array( - 'user' => isset($votes['user']['value']) ? $votes['user']['value'] : NULL, - 'average' => isset($votes['average']['value']) ? $votes['average']['value'] : NULL, - 'count' => isset($votes['count']['value']) ? $votes['count']['value'] : NULL, + 'user' => isset($votes['user']['value']) ? $votes['user']['value'] : 0, + 'average' => isset($votes['average']['value']) ? $votes['average']['value'] : 0, + 'count' => isset($votes['count']['value']) ? $votes['count']['value'] : 0, ); $settings = array( @@ -1415,7 +1415,7 @@ if ($votes === 0) { $output = ''. t('No votes yet') .''; } - +dvm(func_get_args()); $output = '
'. $output .'
'; return $output; } @@ -1666,9 +1666,9 @@ $votes = fivestar_get_votes($content_type, $content_id, $tag); $values = array( - 'user' => empty($votes['user']['value']) ? 0 : $votes['user']['value'], - 'average' => (int)$value, - 'count' => empty($votes['count']['value']) ? 0 : $votes['count']['value'], + 'user' => isset($votes['user']['value']) ? $votes['user']['value'] : 0, + 'average' => isset($votes['average']['value']) ? $votes['average']['value'] : 0, + 'count' => isset($votes['count']['value']) ? $votes['count']['value'] : 0, ); $settings = array(