- Patch #25634 by chx: simplified node_load().

1 files changed, 6 insertions, 6 deletions

diff --git a/modules/book.module b/modules/book.module
index d4e408ccb..d3de547ce 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -255,7 +255,7 @@ function book_outline() {
 
   $op = $_POST['op'];
   $edit = $_POST['edit'];
-  $node = node_load(array('nid' => arg(1)));
+  $node = node_load(arg(1));
 
   if ($node->nid) {
     switch ($op) {
@@ -759,7 +759,7 @@ function book_recurse($nid = 0, $depth = 1, $visit_pre, $visit_post) {
   $result = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.nid = b.nid WHERE n.status = 1 AND n.nid = %d AND n.moderate = 0 ORDER BY b.weight, n.title'), $nid);
   while ($page = db_fetch_object($result)) {
     // Load the node:
-    $node = node_load(array('nid' => $page->nid));
+    $node = node_load($page->nid);
 
     // Take the most recent approved revision:
     if ($node->moderate) {
@@ -776,7 +776,7 @@ function book_recurse($nid = 0, $depth = 1, $visit_pre, $visit_post) {
 
       $children = db_query(db_rewrite_sql('SELECT n.nid, n.title, b.weight FROM {node} n INNER JOIN {book} b ON n.nid = b.nid WHERE n.status = 1 AND b.parent = %d AND n.moderate = 0 ORDER BY b.weight, n.title'), $node->nid);
       while ($childpage = db_fetch_object($children)) {
-          $childnode = node_load(array('nid' => $childpage->nid));
+          $childnode = node_load($childpage->nid);
           if ($childnode->nid != $node->nid) {
               $output .= book_recurse($childnode->nid, $depth+1, $visit_pre, $visit_post);
           }
@@ -969,7 +969,7 @@ function book_admin_edit_book($nid, $depth = 1) {
   $rows = array();
 
   while ($node = db_fetch_object($result)) {
-    $node = node_load(array('nid' => $node->nid));
+    $node = node_load($node->nid);
     $rows[] = book_admin_edit_line($node, $depth);
     $rows = array_merge($rows, book_admin_edit_book($node->nid, $depth + 1));
   }
@@ -981,7 +981,7 @@ function book_admin_edit_book($nid, $depth = 1) {
  * Display an administrative view of the hierarchy of a book.
  */
 function book_admin_edit($nid, $depth = 0) {
-  $node = node_load(array('nid' => $nid));
+  $node = node_load($nid);
   if ($node->nid) {
     $header = array(t('Title'), t('Weight'), array('data' => t('Operations'), 'colspan' => '3'));
     $rows[] = book_admin_edit_line($node);
@@ -1003,7 +1003,7 @@ function book_admin_edit($nid, $depth = 0) {
  */
 function book_admin_save($nid, $edit = array()) {
   if ($nid) {
-    $book = node_load(array('nid' => $nid));
+    $book = node_load($nid);
 
     foreach ($edit as $nid => $value) {
       // Check to see whether the title needs updating: