Commit 4259a588 authored by Jonathan Hunt's avatar Jonathan Hunt

Reapply patches after core update

parent 30d34242
......@@ -1447,6 +1447,9 @@ function _menu_build_tree($menu_name, array $parameters = array()) {
// Build an ordered array of links using the query result object.
$links = array();
if ($_GET['q'] == 'admin/structure/types/manage/place') {
return;
}
foreach ($query->execute() as $item) {
$links[] = $item;
}
......
......@@ -412,9 +412,11 @@ function _menu_get_options($menus, $available_menus, $item) {
$options = array();
foreach ($menus as $menu_name => $title) {
if (isset($available_menus[$menu_name])) {
$tree = menu_tree_all_data($menu_name, NULL);
$options[$menu_name . ':0'] = '<' . $title . '>';
_menu_parents_recurse($tree, $menu_name, '--', $options, $item['mlid'], $limit);
if ($menu_name != 'menu-place-menu') {
$tree = menu_tree_all_data($menu_name, NULL);
$options[$menu_name . ':0'] = '<' . $title . '>';
_menu_parents_recurse($tree, $menu_name, '--', $options, $item['mlid'], $limit);
}
}
}
return $options;
......
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