From ce10e802b0a6849aebb54911f8761f8afd170c94 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Wed, 18 May 2011 18:29:03 -0600 Subject: [PATCH] same as pull req 60 with some formatting/name changes -- menu activation fixes --- includes/roots-activation.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/includes/roots-activation.php b/includes/roots-activation.php index e6ec220..7ef2e09 100644 --- a/includes/roots-activation.php +++ b/includes/roots-activation.php @@ -53,12 +53,16 @@ if (is_admin() && 'themes.php' === $pagenow && isset( $_GET['activated'])) { // automatically create menus and set their locations // add all pages to the Primary Navigation - $primary_nav_id = wp_create_nav_menu('Primary Navigation', array('slug' => 'primary_navigation')); - $utility_nav_id = wp_create_nav_menu('Utility Navigation', array('slug' => 'utility_navigation')); - set_theme_mod('nav_menu_locations', array( - 'primary_navigation' => $primary_nav_id, - 'utility_navigation' => $utility_nav_id - )); + $roots_nav_theme_mod = false; + if (!has_nav_menu('primary_navigation')) { + $primary_nav_id = wp_create_nav_menu('Primary Navigation', array('slug' => 'primary_navigation')); + $roots_nav_theme_mod['primary_navigation'] = $primary_nav_id; + } + if (!has_nav_menu('utility_navigation')) { + $utility_nav_id = wp_create_nav_menu('Utility Navigation', array('slug' => 'utility_navigation')); + $roots_nav_theme_mod['utility_navigation'] = $utility_nav_id; + } + if ($roots_nav_theme_mod) { set_theme_mod('nav_menu_locations', $roots_nav_theme_mod ); } $primary_nav = wp_get_nav_menu_object('Primary Navigation'); $primary_nav_term_id = (int) $primary_nav->term_id;