Commit 124f83e7 authored by Dries's avatar Dries
Browse files

- Patch #716792 by bleen18, agentrickard: remove 'Default menu for content' left-over setting.

parent 12006390
......@@ -656,13 +656,6 @@ function menu_configure() {
);
$menu_options = menu_get_menus();
$form['menu_default_node_menu'] = array(
'#type' => 'select',
'#title' => t('Default menu for content'),
'#default_value' => 'navigation',
'#options' => $menu_options,
'#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
);
$main = variable_get('menu_main_links_source', 'main-menu');
$main_options = array_merge($menu_options, array('' => t('No Main links')));
......
......@@ -541,7 +541,7 @@ function menu_node_delete($node) {
function menu_node_prepare($node) {
if (empty($node->menu)) {
// Prepare the node for the edit form so that $node->menu always exists.
$menu_name = variable_get('menu_default_node_menu', 'navigation');
$menu_name = variable_get('menu_parent_' . $node->type, 'main-menu:0');
$item = array();
if (isset($node->nid)) {
// Give priority to the default menu
......
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