summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/book.module7
-rw-r--r--modules/book/book.module7
2 files changed, 8 insertions, 6 deletions
diff --git a/modules/book.module b/modules/book.module
index 7482bd3eb..94f123447 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -544,9 +544,10 @@ function book_toc($parent = 0, $indent = "", $toc = array()) {
$result = db_query("SELECT n.nid, n.title, b.parent FROM {node} n INNER JOIN {book} b ON n.nid = b.nid WHERE n.status = '1' ORDER BY b.weight, n.title");
while ($node = db_fetch_object($result)) {
- $list = $children[$node->parent] ? $children[$node->parent] : array();
- array_push($list, $node);
- $children[$node->parent] = $list;
+ if (!$children[$node->parent]) {
+ $children[$node->parent] = array();
+ }
+ array_push($children[$node->parent], $node);
}
/*
diff --git a/modules/book/book.module b/modules/book/book.module
index 7482bd3eb..94f123447 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -544,9 +544,10 @@ function book_toc($parent = 0, $indent = "", $toc = array()) {
$result = db_query("SELECT n.nid, n.title, b.parent FROM {node} n INNER JOIN {book} b ON n.nid = b.nid WHERE n.status = '1' ORDER BY b.weight, n.title");
while ($node = db_fetch_object($result)) {
- $list = $children[$node->parent] ? $children[$node->parent] : array();
- array_push($list, $node);
- $children[$node->parent] = $list;
+ if (!$children[$node->parent]) {
+ $children[$node->parent] = array();
+ }
+ array_push($children[$node->parent], $node);
}
/*