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

- Patch #67229 by chx: cleaned up book_load().

5.x
Dries Buytaert 2006-06-05 09:00:22 +00:00
parent cd85ca192b
commit 32b4c92952
2 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/book.module
View File

@ -178,24 +178,7 @@ function book_block($op = 'list', $delta = 0) {
* Implementation of hook_load().
*/
function book_load($node) {
global $user;
$book = db_fetch_object(db_query('SELECT * FROM {book} WHERE vid = %d', $node->vid));
if (arg(2) == 'edit' && !user_access('administer nodes')) {
// If a user is about to update a book page, we overload some
// fields to reflect the changes.
if ($user->uid) {
$book->uid = $user->uid;
$book->name = $user->name;
}
else {
$book->uid = 0;
$book->name = '';
}
}
return $book;
return db_fetch_object(db_query('SELECT * FROM {book} WHERE vid = %d', $node->vid));
}
/**
@ -228,10 +211,13 @@ function book_delete(&$node) {
* Implementation of hook_submit().
*/
function book_submit(&$node) {
global $user;
// Set default values for non-administrators.
if (!user_access('administer nodes')) {
$node->weight = 0;
$node->revision = 1;
$book->uid = $user->uid;
$book->name = $user->uid ? $user->name : '';
}
}

22
modules/book/book.module
View File

@ -178,24 +178,7 @@ function book_block($op = 'list', $delta = 0) {
* Implementation of hook_load().
*/
function book_load($node) {
global $user;
$book = db_fetch_object(db_query('SELECT * FROM {book} WHERE vid = %d', $node->vid));
if (arg(2) == 'edit' && !user_access('administer nodes')) {
// If a user is about to update a book page, we overload some
// fields to reflect the changes.
if ($user->uid) {
$book->uid = $user->uid;
$book->name = $user->name;
}
else {
$book->uid = 0;
$book->name = '';
}
}
return $book;
return db_fetch_object(db_query('SELECT * FROM {book} WHERE vid = %d', $node->vid));
}
/**
@ -228,10 +211,13 @@ function book_delete(&$node) {
* Implementation of hook_submit().
*/
function book_submit(&$node) {
global $user;
// Set default values for non-administrators.
if (!user_access('administer nodes')) {
$node->weight = 0;
$node->revision = 1;
$book->uid = $user->uid;
$book->name = $user->uid ? $user->name : '';
}
}