diff --git a/modules/poll.module b/modules/poll.module
index 8f2c53465603e128d6998bf35e64a55d98380360..f4caebe8c7adbd0b263df1aad51364df17991686 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -91,9 +91,9 @@ function poll_help() {
" . ($p ? " | " : "") . ($p < 100 ? " | ":"") . "
";
+ return "" . ($p ? " | " : "") . ($p < 100 ? " | ":"") . "
";
}
function poll_view($node, $main = 0, $block = 0) {
@@ -125,9 +125,9 @@ function poll_view($node, $main = 0, $block = 0) {
foreach ($node->choice as $key => $value) {
if ($value) {
if ($block) {
- $output .= (!$block ? "
" : "") . check_output($value) . "
" . poll_graph($node->chvotes[$key] / $node->maxvotes) . " | " . round(($node->chvotes[$key] / $node->totalvotes) * 100) . "% |
";
+ $output .= (!$block ? "
" : "") . check_output($value) . "
" . poll_graph($node->chvotes[$key] / $node->maxvotes, $theme->pollfill, $theme->pollempty) . " | " . round(($node->chvotes[$key] / $node->totalvotes) * 100) . "% |
";
} else {
- $output .= "" . check_output($value) . " | " . poll_graph($node->chvotes[$key] / $node->maxvotes) . " | " . round(($node->chvotes[$key] / $node->totalvotes) * 100) . "% |
";
+ $output .= "" . check_output($value) . " | " . poll_graph($node->chvotes[$key] / $node->maxvotes, $theme->pollfill, $theme->pollempty) . " | " . round(($node->chvotes[$key] / $node->totalvotes) * 100) . "% |
";
}
}
}
@@ -279,4 +279,4 @@ function poll_user() {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 8f2c53465603e128d6998bf35e64a55d98380360..f4caebe8c7adbd0b263df1aad51364df17991686 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -91,9 +91,9 @@ function poll_help() {
" . ($p ? " | " : "") . ($p < 100 ? " | ":"") . "
";
+ return "" . ($p ? " | " : "") . ($p < 100 ? " | ":"") . "
";
}
function poll_view($node, $main = 0, $block = 0) {
@@ -125,9 +125,9 @@ function poll_view($node, $main = 0, $block = 0) {
foreach ($node->choice as $key => $value) {
if ($value) {
if ($block) {
- $output .= (!$block ? "
" : "") . check_output($value) . "
" . poll_graph($node->chvotes[$key] / $node->maxvotes) . " | " . round(($node->chvotes[$key] / $node->totalvotes) * 100) . "% |
";
+ $output .= (!$block ? "
" : "") . check_output($value) . "
" . poll_graph($node->chvotes[$key] / $node->maxvotes, $theme->pollfill, $theme->pollempty) . " | " . round(($node->chvotes[$key] / $node->totalvotes) * 100) . "% |
";
} else {
- $output .= "" . check_output($value) . " | " . poll_graph($node->chvotes[$key] / $node->maxvotes) . " | " . round(($node->chvotes[$key] / $node->totalvotes) * 100) . "% |
";
+ $output .= "" . check_output($value) . " | " . poll_graph($node->chvotes[$key] / $node->maxvotes, $theme->pollfill, $theme->pollempty) . " | " . round(($node->chvotes[$key] / $node->totalvotes) * 100) . "% |
";
}
}
}
@@ -279,4 +279,4 @@ function poll_user() {
}
}
-?>
\ No newline at end of file
+?>