Commit 18117a43 authored by Dries's avatar Dries

- Patch #361529 by j.somers: illogical syntax for book_toc().

parent 8e4022fe
...@@ -401,7 +401,7 @@ function _book_parent_select($book_link) { ...@@ -401,7 +401,7 @@ function _book_parent_select($book_link) {
'#title' => t('Parent item'), '#title' => t('Parent item'),
'#default_value' => $book_link['plid'], '#default_value' => $book_link['plid'],
'#description' => t('The parent page in the book. The maximum depth for a book and all child pages is !maxdepth. Some pages in the selected book may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)), '#description' => t('The parent page in the book. The maximum depth for a book and all child pages is !maxdepth. Some pages in the selected book may not be available as parents if selecting them would exceed this limit.', array('!maxdepth' => MENU_MAX_DEPTH)),
'#options' => book_toc($book_link['bid'], array($book_link['mlid']), $book_link['parent_depth_limit']), '#options' => book_toc($book_link['bid'], $book_link['parent_depth_limit'], array($book_link['mlid'])),
'#attributes' => array('class' => 'book-title-select'), '#attributes' => array('class' => 'book-title-select'),
); );
} }
...@@ -945,15 +945,15 @@ function _book_toc_recurse($tree, $indent, &$toc, $exclude, $depth_limit) { ...@@ -945,15 +945,15 @@ function _book_toc_recurse($tree, $indent, &$toc, $exclude, $depth_limit) {
* *
* @param $bid * @param $bid
* The ID of the book whose pages are to be listed. * The ID of the book whose pages are to be listed.
* @param $depth_limit
* Any link deeper than this value will be excluded (along with its children).
* @param $exclude * @param $exclude
* Optional array of mlid values. Any link whose mlid is in this array * Optional array of mlid values. Any link whose mlid is in this array
* will be excluded (along with its children). * will be excluded (along with its children).
* @param $depth_limit
* Any link deeper than this value will be excluded (along with its children).
* @return * @return
* An array of mlid, title pairs for use as options for selecting a book page. * An array of mlid, title pairs for use as options for selecting a book page.
*/ */
function book_toc($bid, $exclude = array(), $depth_limit) { function book_toc($bid, $depth_limit, $exclude = array()) {
$tree = menu_tree_all_data(book_menu_name($bid)); $tree = menu_tree_all_data(book_menu_name($bid));
$toc = array(); $toc = array();
_book_toc_recurse($tree, '', $toc, $exclude, $depth_limit); _book_toc_recurse($tree, '', $toc, $exclude, $depth_limit);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment