From 046536f470450f94c22aa8058d966716fbfbcab4 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 22 Dec 2004 20:47:47 +0000
Subject: - Patch #12366 by mathias: fixed missing book edit tab.

---
 modules/book.module      | 15 +++------------
 modules/book/book.module | 15 +++------------
 2 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'modules')

diff --git a/modules/book.module b/modules/book.module
index 65f2d5e45..78a624dce 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -26,14 +26,6 @@ function book_perm() {
 function book_access($op, $node) {
   global $user;
 
-  if ($op == 'view') {
-    // Everyone can access all published book pages whether these pages
-    // are still waiting for approval or not.  We might not always want
-    // to display pages that are waiting for approval, but we take care
-    // of that problem in the book_content() function.
-    return ($node->status ? $node->status : ($node->uid == $user->uid && user_access('edit own book pages')));
-  }
-
   if ($op == 'create') {
     // Only registered users can create book pages.  Given the nature
     // of the book module this is considered to be a good/safe idea.
@@ -44,11 +36,10 @@ function book_access($op, $node) {
     // Only registered users can update book pages.  Given the nature
     // of the book module this is considered to be a good/safe idea.
     // One can only update a book page if there are no suggested updates
-    // of that page waiting for approval and as long as the "create new
-    // revision"-bit is set.  That is, only updates that don't overwrite
-    // the current or pending information are allowed.
+    // of that page waiting for approval.  That is, only updates that
+    // don't overwrite the current or pending information are allowed.
 
-    return ((user_access('maintain books') && !$node->moderate && $node->revision) || ($node->uid == $user->uid && user_access('edit own book pages')));
+    return ((user_access('maintain books') && !$node->moderate) || ($node->uid == $user->uid && user_access('edit own book pages')));
   }
 }
 
diff --git a/modules/book/book.module b/modules/book/book.module
index 65f2d5e45..78a624dce 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -26,14 +26,6 @@ function book_perm() {
 function book_access($op, $node) {
   global $user;
 
-  if ($op == 'view') {
-    // Everyone can access all published book pages whether these pages
-    // are still waiting for approval or not.  We might not always want
-    // to display pages that are waiting for approval, but we take care
-    // of that problem in the book_content() function.
-    return ($node->status ? $node->status : ($node->uid == $user->uid && user_access('edit own book pages')));
-  }
-
   if ($op == 'create') {
     // Only registered users can create book pages.  Given the nature
     // of the book module this is considered to be a good/safe idea.
@@ -44,11 +36,10 @@ function book_access($op, $node) {
     // Only registered users can update book pages.  Given the nature
     // of the book module this is considered to be a good/safe idea.
     // One can only update a book page if there are no suggested updates
-    // of that page waiting for approval and as long as the "create new
-    // revision"-bit is set.  That is, only updates that don't overwrite
-    // the current or pending information are allowed.
+    // of that page waiting for approval.  That is, only updates that
+    // don't overwrite the current or pending information are allowed.
 
-    return ((user_access('maintain books') && !$node->moderate && $node->revision) || ($node->uid == $user->uid && user_access('edit own book pages')));
+    return ((user_access('maintain books') && !$node->moderate) || ($node->uid == $user->uid && user_access('edit own book pages')));
   }
 }
 
-- 
cgit v1.2.3