diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/menu.inc | 16 | ||||
| -rw-r--r-- | includes/theme.inc | 12 | ||||
| -rw-r--r-- | includes/theme.maintenance.inc | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 21067cd5c..eaad81aa3 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1251,28 +1251,28 @@ function menu_get_names($reset = FALSE) { * Return an array containing the names of system-defined (default) menus. */ function menu_list_system_menus() { - return array('navigation', 'primary-links', 'secondary-links'); + return array('navigation', 'main-menu', 'secondary-menu'); } /** - * Return an array of links to be rendered as the Primary links. + * Return an array of links to be rendered as the Main menu. */ -function menu_primary_links() { - return menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links')); +function menu_main_menu() { + return menu_navigation_links(variable_get('menu_main_menu_source', 'main-menu')); } /** * Return an array of links to be rendered as the Secondary links. */ -function menu_secondary_links() { +function menu_secondary_menu() { // If the secondary menu source is set as the primary menu, we display the // second level of the primary menu. - if (variable_get('menu_secondary_links_source', 'secondary-links') == variable_get('menu_primary_links_source', 'primary-links')) { - return menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'), 1); + if (variable_get('menu_secondary_menu_source', 'secondary-menu') == variable_get('menu_main_menu_source', 'main-menu')) { + return menu_navigation_links(variable_get('menu_main_menu_source', 'main-menu'), 1); } else { - return menu_navigation_links(variable_get('menu_secondary_links_source', 'secondary-links'), 0); + return menu_navigation_links(variable_get('menu_secondary_menu_source', 'secondary-menu'), 0); } } 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', '') : ''); diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index 83590a24b..4f0a50ac5 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -252,8 +252,8 @@ function template_preprocess_maintenance_page(&$variables) { $variables['logo'] = theme_get_setting('logo'); $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; $variables['mission'] = ''; - $variables['primary_links'] = array(); - $variables['secondary_links'] = array(); + $variables['main_menu'] = array(); + $variables['secondary_menu'] = array(); $variables['search_box'] = ''; $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', '') : ''); |