Commit 2a19a5c3 authored by Gábor Hojtsy's avatar Gábor Hojtsy

#180588 by merlinofchaos: run tabs through theme('menu_item_link') compared to...

#180588 by merlinofchaos: run tabs through theme('menu_item_link') compared to just l() directly, so they can be properly themed
parent 8ac45b1a
......@@ -923,6 +923,10 @@ function _menu_tree_data($result, $parents, $depth, $previous_element = '') {
* Generate the HTML output for a single menu link.
*/
function theme_menu_item_link($link) {
if (empty($link['options'])) {
$link['options'] = array();
}
return l($link['title'], $link['href'], $link['options']);
}
......@@ -1135,12 +1139,12 @@ function menu_local_tasks($level = 0, $return_root = FALSE) {
if ($item['type'] == MENU_DEFAULT_LOCAL_TASK) {
// Find the first parent which is not a default local task.
for ($p = $item['tab_parent']; $tasks[$p]['type'] == MENU_DEFAULT_LOCAL_TASK; $p = $tasks[$p]['tab_parent']);
$link = l($item['title'], $tasks[$p]['href']);
$link = theme('menu_item_link', array('title' => $item['title'], 'href' => $tasks[$p]['href']));
$tabs_current .= theme('menu_local_task', $link, TRUE);
$next_path = $item['path'];
}
else {
$link = l($item['title'], $item['href']);
$link = theme('menu_item_link', $item);
$tabs_current .= theme('menu_local_task', $link);
}
}
......@@ -1167,13 +1171,13 @@ function menu_local_tasks($level = 0, $return_root = FALSE) {
if ($item['type'] == MENU_DEFAULT_LOCAL_TASK) {
// Find the first parent which is not a default local task.
for ($p = $item['tab_parent']; $tasks[$p]['type'] == MENU_DEFAULT_LOCAL_TASK; $p = $tasks[$p]['tab_parent']);
$link = l($item['title'], $tasks[$p]['href']);
$link = theme('menu_item_link', array('title' => $item['title'], 'href' => $tasks[$p]['href']));
if ($item['path'] == $router_item['path']) {
$root_path = $tasks[$p]['path'];
}
}
else {
$link = l($item['title'], $item['href']);
$link = theme('menu_item_link', $item);
}
// We check for the active tab.
if ($item['path'] == $path) {
......
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