Index: modules/book.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/book.module,v
retrieving revision 1.317
diff -u -p -r1.317 book.module
--- modules/book.module 23 Sep 2005 08:47:13 -0000 1.317
+++ modules/book.module 29 Sep 2005 16:36:19 -0000
@@ -310,34 +310,6 @@ function book_outline() {
}
}
-
-/**
- * Return the most recent revision that matches the specified conditions.
- */
-function book_revision_load($page, $conditions = array()) {
-
- $revisions = array_reverse(node_revision_list($page));
-
- foreach ($revisions as $revision) {
-
- // Extract the specified revision:
- $node = node_revision_load($page, $revision);
-
- // Check to see if the conditions are met:
- $status = TRUE;
-
- foreach ($conditions as $key => $value) {
- if ($node->$key != $value) {
- $status = FALSE;
- }
- }
-
- if ($status) {
- return $node;
- }
- }
-}
-
/**
* Return the path (call stack) to a certain book page.
*/
@@ -416,17 +388,6 @@ function book_next($node) {
function book_content($node, $teaser = FALSE) {
$op = $_POST['op'];
- // Always display the most recently approved revision of a node
- // (if any) unless we have to display this page in the context of
- // the moderation queue.
- if ($op != t('Preview') && $node->moderate && arg(0) != 'queue') {
- $revision = book_revision_load($node, array('moderate' => 0, 'status' => 1));
-
- if ($revision) {
- $node = $revision;
- }
- }
-
// Extract the page body.
$node = node_prepare($node, $teaser);
@@ -676,42 +637,49 @@ function book_render() {
function book_export($type = 'html', $nid = 0) {
global $base_url;
$type = drupal_strtolower($type);
- $depth = _book_get_depth($nid);
- $node = node_load($nid);
- switch ($type) {
- case 'docbook':
- $xml = "\n";
- $xml .= "\n";
- $xml .= book_recurse($nid, $depth, 'book_node_visitor_xml_pre', 'book_node_visitor_xml_post');
- drupal_set_header('Content-Type: text/xml; charset=utf-8');
- print $xml;
- break;
- case 'html':
- for ($i = 1; $i < $depth; $i++) {
- $output .= "\n";
- }
- $output .= book_recurse($nid, $depth, 'book_node_visitor_html_pre', 'book_node_visitor_html_post');
- for ($i = 1; $i < $depth; $i++) {
- $output .= "
\n";
- }
- $html = "\n";
- $html .= '';
- $html .= "\n". check_plain($node->title) ."\n";
- $html .= '';
- $html .= '' . "\n";
- $html .= "\n";
- $html .= "\n\n". $output . "\n\n\n";
- print $html;
- break;
- case 'opml':
- $output .= book_recurse($nid, $depth, 'book_node_visitor_opml_pre', 'book_node_visitor_opml_post');
- $ompl = "\n";
- $opml .= "\n";
- $opml .= "\n". check_plain($node->title) ."\n";
- $opml .= "\n\n". $output . "\n\n\n";
- drupal_set_header('Content-Type: text/xml; charset=utf-8');
- print $opml;
- break;
+ if ($nid) {
+ $depth = _book_get_depth($nid);
+ $node = node_load($nid);
+ switch ($type) {
+ case 'docbook':
+ $xml = "\n";
+ $xml .= "\n";
+ $xml .= book_recurse($nid, $depth, 'book_node_visitor_xml_pre', 'book_node_visitor_xml_post');
+ drupal_set_header('Content-Type: text/xml; charset=utf-8');
+ print $xml;
+ break;
+ case 'html':
+ for ($i = 1; $i < $depth; $i++) {
+ $output .= "\n";
+ }
+ $output .= book_recurse($nid, $depth, 'book_node_visitor_html_pre', 'book_node_visitor_html_post');
+ for ($i = 1; $i < $depth; $i++) {
+ $output .= "
\n";
+ }
+ $html = "\n";
+ $html .= '';
+ $html .= "\n". check_plain($node->title) ."\n";
+ $html .= '';
+ $html .= '' . "\n";
+ $html .= "\n";
+ $html .= "\n\n". $output . "\n\n\n";
+ print $html;
+ break;
+ case 'opml':
+ $output .= book_recurse($nid, $depth, 'book_node_visitor_opml_pre', 'book_node_visitor_opml_post');
+ $ompl = "\n";
+ $opml .= "\n";
+ $opml .= "\n". check_plain($node->title) ."\n";
+ $opml .= "\n\n". $output . "\n\n\n";
+ drupal_set_header('Content-Type: text/xml; charset=utf-8');
+ print $opml;
+ break;
+ default:
+ drupal_not_found();
+ }
+ }
+ else {
+ drupal_not_found();
}
}
@@ -771,11 +739,6 @@ function book_recurse($nid = 0, $depth =
// Load the node:
$node = node_load($page->nid);
- // Take the most recent approved revision:
- if ($node->moderate) {
- $node = book_revision_load($node, array('moderate' => 0, 'status' => 1));
- }
-
if ($node) {
if (function_exists($visit_pre)) {
$output .= call_user_func($visit_pre, $node, $depth, $nid);