diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-12-22 12:05:07 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-12-22 12:05:07 +0000 |
| commit | bf51896e859665547b322727325c8abf10e77982 (patch) | |
| tree | 9aa59eeff90f3fd1e05b2ee241766fa208bfdafc /modules | |
| parent | 6ab859555c891d72c8d19be374d988e413bc5595 (diff) | |
| download | brdo-bf51896e859665547b322727325c8abf10e77982.tar.gz brdo-bf51896e859665547b322727325c8abf10e77982.tar.bz2 | |
- The introduction of the $page parameter for the node _view() hooks and
the theme functions left the poll module's poll_view() function in a
state where it does not display the poll results or vote forms on their
own pages, since it uses another (proprietary) $block parameter to
handle the case when the poll is rendered to be displayed in a block.
Patch by Goba.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/poll.module | 4 | ||||
| -rw-r--r-- | modules/poll/poll.module | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/poll.module b/modules/poll.module index 24819de44..6e8d16501 100644 --- a/modules/poll.module +++ b/modules/poll.module @@ -54,7 +54,7 @@ function poll_block($op = "list", $delta = 0) { $poll = node_load(array("type" => "poll", "created" => $timestamp, "moderate" => "0", "status" => "1")); if ($poll->nid) { // Poll_view dumps the output into $poll->body - poll_view($poll, 1, 1); + poll_view($poll, 1, 0, 1); } } $block["subject"] = t("Poll"); @@ -347,7 +347,7 @@ function poll_view_processvote(&$node) { } } -function poll_view(&$node, $main = 0, $block = 0) { +function poll_view(&$node, $main = 0, $page = 0, $block = 0) { global $user; /* diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 24819de44..6e8d16501 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -54,7 +54,7 @@ function poll_block($op = "list", $delta = 0) { $poll = node_load(array("type" => "poll", "created" => $timestamp, "moderate" => "0", "status" => "1")); if ($poll->nid) { // Poll_view dumps the output into $poll->body - poll_view($poll, 1, 1); + poll_view($poll, 1, 0, 1); } } $block["subject"] = t("Poll"); @@ -347,7 +347,7 @@ function poll_view_processvote(&$node) { } } -function poll_view(&$node, $main = 0, $block = 0) { +function poll_view(&$node, $main = 0, $page = 0, $block = 0) { global $user; /* |