diff options
Diffstat (limited to 'modules/poll')
| -rw-r--r-- | modules/poll/poll.module | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/poll/poll.module b/modules/poll/poll.module index a3195294e..24477f341 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -78,7 +78,7 @@ function poll_search($keys) { global $status; $result = db_query("SELECT n.*, p.* FROM poll p LEFT JOIN node n ON n.nid = p.nid AND n.lid = p.lid WHERE n.status = '$status[posted]' AND (n.title LIKE '%$keys%') LIMIT 20"); while ($poll = db_fetch_object($result)) { - $find[$i++] = array("title" => check_output($poll->title), "link" => (user_access("administer nodes") ? "admin.php?mod=poll&op=edit&id=$poll->nid" : "node.php?id=$poll->nid"), "user" => $poll->userid, "date" => $poll->timestamp); + $find[$i++] = array("title" => check_output($poll->title), "link" => (user_access("administer nodes") ? "admin.php?mod=poll&op=edit&id=$poll->nid" : "node.php?id=$poll->nid"), "user" => $poll->name, "date" => $poll->timestamp); } return $find; } @@ -104,16 +104,16 @@ function poll_view($node, $main = 0, $block = 0) { $pollop = $op; - if (($node->active) && (!field_get($node->voters, $user->userid))) $voting = 1; + if (($node->active) && (!field_get($node->voters, $user->name))) $voting = 1; if ((!$voting) && ($pollop != "View")) $pollop = "View"; switch ($pollop) { case "Vote": - if (($node->active) && (!field_get($node->voters, $user->userid))) { + if (($node->active) && (!field_get($node->voters, $user->name))) { $result = db_query("UPDATE poll_choices SET chvotes=chvotes+1 WHERE nid='" . $node->nid . "' && chid='" . check_input($chid) . "'"); if (($result) && ($user)) { $new = node_get_array(array("nid" => $node->nid)); - $new[voters] = field_set($node->voters, $user->userid, 1); + $new[voters] = field_set($node->voters, $user->name, 1); node_save($new, array(voters)); $node = node_get_object(array("nid" => $node->nid)); } @@ -186,8 +186,8 @@ function poll_form($edit = array(), $nocheck = 0) { $form .= form_submit(t("Preview")) . "<br><br><br>"; /* Main form */ - $form .= form_item(t("Your name"), format_username(($edit[userid] ? $edit[userid] : $user->userid))); - $form .= form_hidden("userid", $edit[userid]); + $form .= form_item(t("Your name"), format_name(($edit[name] ? $edit[name] : $user->name))); + $form .= form_hidden("name", $edit[name]); $form .= form_textfield(t("Question"), "title", $edit[title], 50, 127); for ($a = 0; $a < $choices; $a++) { |