summaryrefslogtreecommitdiff
path: root/modules/poll.module
diff options
context:
space:
mode:
authorKjartan Mannes <kjartan@2.no-reply.drupal.org>2002-05-12 15:40:57 +0000
committerKjartan Mannes <kjartan@2.no-reply.drupal.org>2002-05-12 15:40:57 +0000
commitf86a944979de75225dc3ddd00920ebedbfe307ed (patch)
treef2a1ebeb51fea0ee7ccdc5019c7fa1856893e48c /modules/poll.module
parent497ab799ef0cdb40068d84c0bd2eccd2f7a3a480 (diff)
downloadbrdo-f86a944979de75225dc3ddd00920ebedbfe307ed.tar.gz
brdo-f86a944979de75225dc3ddd00920ebedbfe307ed.tar.bz2
- applied Stevens link patch.
- fixed block permissions. - fixed user admin page errors: http://www.drupal.org/node.php?id=173. - cleaned up common.inc a bit: removed format_info, path_img, field_merge.
Diffstat (limited to 'modules/poll.module')
-rw-r--r--modules/poll.module15
1 files changed, 8 insertions, 7 deletions
diff --git a/modules/poll.module b/modules/poll.module
index c64bfebc9..9cb0bf20a 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -116,7 +116,7 @@ function poll_insert($node) {
function poll_link($type) {
if ($type == "menu.create" && user_access("post content")) {
- $links[] = lm(t("create poll"), array("mod" => "node", "op" => "add", "type" => "poll"), t("Add a new poll."));
+ $links[] = lm(t("create poll"), array("mod" => "node", "op" => "add", "type" => "poll"), "", array("title", t("Add a new poll.")));
}
return $links ? $links : array();
@@ -214,7 +214,7 @@ function poll_view(&$node, $main = 0, $block = 0) {
if ($allowvotes) {
// Display the vote form
- $url = request_uri() . (strstr(request_uri(), "?") ? "&" : "?") ."pollid=". $pollidcount;
+ $url = request_uri() . (strstr(request_uri(), "?") ? "&amp;" : "?") ."pollid=". $pollidcount;
$output .= "<form action=\"$url\" method=\"post\">";
$output .= "<table border=\"0\" align=\"center\"><tr><td>";
@@ -225,7 +225,8 @@ function poll_view(&$node, $main = 0, $block = 0) {
}
if ($block) {
$output .= "</td></tr><tr><td><div align=\"center\">". form_submit(t("Vote")) ."</div></td></tr></table>";
- } else {
+ }
+ else {
$output .= "</td><td valign=\"middle\"><div align=\"right\">&nbsp;&nbsp;&nbsp;". form_submit(t("Vote")) ."</div></td></tr></table>";
}
$output .= "</form>";
@@ -241,10 +242,10 @@ function poll_view(&$node, $main = 0, $block = 0) {
$votesmax = max($votesmax, 1);
// Define CSS classes for the bars
- $output .= "<style type=\"text/css\">";
- $output .= "td.pollfg { background-color: ". $theme->foreground ."; font-size: 5pt; }";
- $output .= "td.pollbg { background-color: ". $theme->background ."; font-size: 5pt; }";
- $output .= "</style>";
+ $output .= "<style type=\"text/css\">\n";
+ $output .= "td.pollfg { background-color: ". $theme->foreground ."; font-size: 5pt; }\n";
+ $output .= "td.pollbg { background-color: ". $theme->background ."; font-size: 5pt; }\n";
+ $output .= "</style>\n";
foreach ($node->choice as $key => $value) {
if ($value != "") {