diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-06-16 23:18:12 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-06-16 23:18:12 +0000 |
| commit | fcb27eed2302a13733ee697ec55fc1f2ba1e3843 (patch) | |
| tree | 1941fdac6747d21a1562804bdf7dd1320e31177d /modules | |
| parent | cf42d0c25a7b3e3fb990e39cc449b10a8b980d21 (diff) | |
| download | brdo-fcb27eed2302a13733ee697ec55fc1f2ba1e3843.tar.gz brdo-fcb27eed2302a13733ee697ec55fc1f2ba1e3843.tar.bz2 | |
- Patch #251239 by pwolanin: revert.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/book/book.module | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/modules/book/book.module b/modules/book/book.module index 65ea2d728..bf6988565 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -676,17 +676,15 @@ function book_build_active_trail($book_link) { function book_nodeapi(&$node, $op, $teaser, $page) { switch ($op) { case 'load': - if (in_array($node->type, variable_get('book_allowed_types', array('book')))) { - // Note - we cannot use book_link_load() because it will call node_load(). - $info['book'] = db_fetch_array(db_query('SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid = %d', $node->nid)); + // Note - we cannot use book_link_load() because it will call node_load(). + $info['book'] = db_fetch_array(db_query('SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid = %d', $node->nid)); - if ($info['book']) { - $info['book']['href'] = $info['book']['link_path']; - $info['book']['title'] = $info['book']['link_title']; - $info['book']['options'] = unserialize($info['book']['options']); + if ($info['book']) { + $info['book']['href'] = $info['book']['link_path']; + $info['book']['title'] = $info['book']['link_title']; + $info['book']['options'] = unserialize($info['book']['options']); - return $info; - } + return $info; } break; |