summaryrefslogtreecommitdiff
path: root/modules/menu
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-06-26 21:32:20 +0000
committerDries Buytaert <dries@buytaert.net>2010-06-26 21:32:20 +0000
commite27e1a0e0df1e070d8172921461b815317f4bfaa (patch)
tree4136c973a3c66295ce8e4a6853e08faf7111283f /modules/menu
parent218c363c5a79fdfe5c0d8867f0f1c0c4b973a724 (diff)
downloadbrdo-e27e1a0e0df1e070d8172921461b815317f4bfaa.tar.gz
brdo-e27e1a0e0df1e070d8172921461b815317f4bfaa.tar.bz2
- Patch #266246 by sun, effulgentsia, marcingy: remove smart defaults for system_settings_form().
Diffstat (limited to 'modules/menu')
-rw-r--r--modules/menu/menu.admin.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index 3677eff99..5ff35d138 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -684,7 +684,7 @@ function menu_configure() {
$form['menu_main_links_source'] = array(
'#type' => 'select',
'#title' => t('Source for the Main links'),
- '#default_value' => 'main-menu',
+ '#default_value' => variable_get('menu_main_links_source', 'main-menu'),
'#options' => $main_options,
'#tree' => FALSE,
'#description' => t('Select what should be displayed as the Main links (typically at the top of the page).'),
@@ -694,11 +694,11 @@ function menu_configure() {
$form['menu_secondary_links_source'] = array(
'#type' => 'select',
'#title' => t('Source for the Secondary links'),
- '#default_value' => 'user-menu',
+ '#default_value' => variable_get('menu_secondary_links_source', 'user-menu'),
'#options' => $secondary_options,
'#tree' => FALSE,
'#description' => t("Select the source for the Secondary links. An advanced option allows you to use the same source for both Main links (currently %main) and Secondary links: if your source menu has two levels of hierarchy, the top level menu links will appear in the Main links, and the children of the active link will appear in the Secondary links." , array('%main' => $main_options[$main])),
);
- return system_settings_form($form, TRUE);
+ return system_settings_form($form);
}