summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/book.module2
-rw-r--r--modules/book/book.module2
-rw-r--r--modules/poll.module5
-rw-r--r--modules/poll/poll.module5
4 files changed, 8 insertions, 6 deletions
diff --git a/modules/book.module b/modules/book.module
index d5802fb33..50aae88f6 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -573,7 +573,7 @@ function book_navigation($node) {
foreach ($path as $level) {
$node->breadcrumb[] = array('path' => 'book/view/'. $level->nid, 'title' => $level->title);
}
- $node->breadcrumb[] = array('path' => 'book/view/'. $node->nid);
+ $node->breadcrumb[] = array('path' => 'node/'. $node->nid);
if ($node->nid) {
$output .= '<div class="book">';
diff --git a/modules/book/book.module b/modules/book/book.module
index d5802fb33..50aae88f6 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -573,7 +573,7 @@ function book_navigation($node) {
foreach ($path as $level) {
$node->breadcrumb[] = array('path' => 'book/view/'. $level->nid, 'title' => $level->title);
}
- $node->breadcrumb[] = array('path' => 'book/view/'. $node->nid);
+ $node->breadcrumb[] = array('path' => 'node/'. $node->nid);
if ($node->nid) {
$output .= '<div class="book">';
diff --git a/modules/poll.module b/modules/poll.module
index 5ee083a54..45bd9fa2e 100644
--- a/modules/poll.module
+++ b/modules/poll.module
@@ -304,9 +304,9 @@ function poll_teaser($node) {
*/
function poll_view_voting(&$node, $main, $page, $block) {
$url = request_uri();
- $output .= '<div class="poll">';
+ $output = '<div class="poll">';
- $form .= '<div class="vote-form">';
+ $form = '<div class="vote-form">';
$form .= '<div class="choices">';
if ($node->choice) {
$list = array();
@@ -415,6 +415,7 @@ function poll_vote(&$node) {
*/
function poll_view(&$node, $main = 0, $page = 0, $block = 0) {
global $user;
+ $output = '';
if ($node->allowvotes && ($block || arg(2) != 'results')) {
$output .= poll_view_voting($node, $main, $page, $block);
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index 5ee083a54..45bd9fa2e 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -304,9 +304,9 @@ function poll_teaser($node) {
*/
function poll_view_voting(&$node, $main, $page, $block) {
$url = request_uri();
- $output .= '<div class="poll">';
+ $output = '<div class="poll">';
- $form .= '<div class="vote-form">';
+ $form = '<div class="vote-form">';
$form .= '<div class="choices">';
if ($node->choice) {
$list = array();
@@ -415,6 +415,7 @@ function poll_vote(&$node) {
*/
function poll_view(&$node, $main = 0, $page = 0, $block = 0) {
global $user;
+ $output = '';
if ($node->allowvotes && ($block || arg(2) != 'results')) {
$output .= poll_view_voting($node, $main, $page, $block);