Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #12366 by mathias: fixed missing book edit tab.

4.6.x
Dries Buytaert 2004-12-22 20:47:47 +00:00
parent 9f2952aa3f
commit 046536f470
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/book.module
View File

@ -26,14 +26,6 @@ function book_perm() {
function book_access($op, $node) { function book_access($op, $node) {
global $user; 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') { if ($op == 'create') {
// Only registered users can create book pages. Given the nature // Only registered users can create book pages. Given the nature
// of the book module this is considered to be a good/safe idea. // 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 // Only registered users can update book pages. Given the nature
// of the book module this is considered to be a good/safe idea. // 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 // 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 // of that page waiting for approval. That is, only updates that
// revision"-bit is set. That is, only updates that don't overwrite // don't overwrite the current or pending information are allowed.
// 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')));
} }
} }

15
modules/book/book.module
View File

@ -26,14 +26,6 @@ function book_perm() {
function book_access($op, $node) { function book_access($op, $node) {
global $user; 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') { if ($op == 'create') {
// Only registered users can create book pages. Given the nature // Only registered users can create book pages. Given the nature
// of the book module this is considered to be a good/safe idea. // 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 // Only registered users can update book pages. Given the nature
// of the book module this is considered to be a good/safe idea. // 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 // 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 // of that page waiting for approval. That is, only updates that
// revision"-bit is set. That is, only updates that don't overwrite // don't overwrite the current or pending information are allowed.
// 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')));
} }
} }