diff options
Diffstat (limited to 'includes/theme.inc')
-rw-r--r-- | includes/theme.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 5a7ac3722..3a3e81cf8 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -864,8 +864,8 @@ function theme_get_settings($key = NULL) { 'logo_path' => '', 'default_favicon' => 1, 'favicon_path' => '', - 'primary_links' => 1, - 'secondary_links' => 1, + 'main_menu' => 1, + 'secondary_menu' => 1, 'toggle_logo' => 1, 'toggle_favicon' => 1, 'toggle_name' => 1, @@ -874,8 +874,8 @@ function theme_get_settings($key = NULL) { 'toggle_mission' => 1, 'toggle_node_user_picture' => 0, 'toggle_comment_user_picture' => 0, - 'toggle_primary_links' => 1, - 'toggle_secondary_links' => 1, + 'toggle_main_menu' => 1, + 'toggle_secondary_menu' => 1, ); if (module_exists('node')) { @@ -1838,8 +1838,8 @@ function template_preprocess_page(&$variables) { $variables['logo'] = theme_get_setting('logo'); $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; $variables['mission'] = isset($mission) ? $mission : ''; - $variables['primary_links'] = theme_get_setting('toggle_primary_links') ? menu_primary_links() : array(); - $variables['secondary_links'] = theme_get_setting('toggle_secondary_links') ? menu_secondary_links() : array(); + $variables['main_menu'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array(); + $variables['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array(); $variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : ''); $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : ''); |