diff options
| -rw-r--r-- | modules/poll/poll.module | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 64f83f0b3..8c6f60319 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -299,6 +299,24 @@ function poll_load($node) { while ($choice = db_fetch_array($result)) { $poll->choice[$choice['chorder']] = $choice; } + + // Determine whether or not this user is allowed to vote + $poll->allowvotes = FALSE; + if (user_access('vote on polls') && $poll->active) { + if ($user->uid) { + $result = db_fetch_object(db_query('SELECT chorder FROM {poll_votes} WHERE nid = %d AND uid = %d', $node->nid, $user->uid)); + } + else { + $result = db_fetch_object(db_query("SELECT chorder FROM {poll_votes} WHERE nid = %d AND hostname = '%s'", $node->nid, ip_address())); + } + if (isset($result->chorder)) { + $poll->vote = $result->chorder; + } + else { + $poll->vote = -1; + $poll->allowvotes = TRUE; + } + } return $poll; } @@ -364,25 +382,6 @@ function poll_view($node, $teaser = FALSE, $page = FALSE, $block = FALSE) { global $user; $output = ''; - // Determine whether or not this user is allowed to vote - $poll->allowvotes = FALSE; - if (user_access('vote on polls') && $poll->active) { - if ($user->uid) { - $result = db_fetch_object(db_query('SELECT chorder FROM {poll_votes} WHERE nid = %d AND uid = %d', $node->nid, $user->uid)); - } - else { - $result = db_fetch_object(db_query("SELECT chorder FROM {poll_votes} WHERE nid = %d AND hostname = '%s'", $node->nid, ip_address())); - } - if (isset($result->chorder)) { - $poll->vote = $result->chorder; - } - else { - $poll->vote = -1; - $poll->allowvotes = TRUE; - } - } - - // Special display for side-block if ($block) { // No 'read more' link |