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

Issue #1222248 by sun, andypost, jenlampton: Remove theme_book_title_link() use l() instead.

8.0.x
catch 2012-11-11 23:06:53 +00:00
parent a030211046
commit e9e0214426
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/modules/book/book.module
View File

@ -51,9 +51,6 @@ function book_theme() {
'book_admin_table' => array( 'book_admin_table' => array(
'render element' => 'form', 'render element' => 'form',
), ),
'book_title_link' => array(
'variables' => array('link' => NULL),
),
'book_all_books_block' => array( 'book_all_books_block' => array(
'render element' => 'book_menus', 'render element' => 'book_menus',
'template' => 'book-all-books-block', 'template' => 'book-all-books-block',
@ -320,7 +317,7 @@ function book_block_view($delta = '') {
$tree = menu_tree_all_data($node->book['menu_name'], $node->book); $tree = menu_tree_all_data($node->book['menu_name'], $node->book);
// There should only be one element at the top level. // There should only be one element at the top level.
$data = array_shift($tree); $data = array_shift($tree);
$block['subject'] = theme('book_title_link', array('link' => $data['link'])); $block['subject'] = l($data['link']['title'], $data['link']['href'], $data['link']['options']);
$block['content'] = ($data['below']) ? menu_tree_output($data['below']) : ''; $block['content'] = ($data['below']) ? menu_tree_output($data['below']) : '';
} }
} }
@ -356,23 +353,6 @@ function book_block_save($delta = '', $edit = array()) {
config('book.settings')->set('block.navigation.mode', $edit['book_block_mode'])->save(); config('book.settings')->set('block.navigation.mode', $edit['book_block_mode'])->save();
} }
/**
* Returns HTML for a link to a book title when used as a block title.
*
* @param $variables
* An associative array containing:
* - link: An array containing title, href and options for the link.
*
* @ingroup themeable
*/
function theme_book_title_link($variables) {
$link = $variables['link'];
$link['options']['attributes']['class'] = array('book-title');
return l($link['title'], $link['href'], $link['options']);
}
/** /**
* Returns an array of all books. * Returns an array of all books.
* *