Changeset 45590 for trunk/src/wp-includes/nav-menu-template.php
- Timestamp:
- 07/02/2019 11:41:16 PM (7 years ago)
- File:
-
- 1 edited
-
trunk/src/wp-includes/nav-menu-template.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/nav-menu-template.php
r44966 r45590 117 117 118 118 // Get the nav menu based on the theme_location 119 if ( ! $menu && $args->theme_location && ( $locations = get_nav_menu_locations() ) && isset( $locations[ $args->theme_location ] ) ) { 119 $locations = get_nav_menu_locations(); 120 if ( ! $menu && $args->theme_location && $locations && isset( $locations[ $args->theme_location ] ) ) { 120 121 $menu = wp_get_nav_menu_object( $locations[ $args->theme_location ] ); 121 122 } … … 125 126 $menus = wp_get_nav_menus(); 126 127 foreach ( $menus as $menu_maybe ) { 127 if ( $menu_items = wp_get_nav_menu_items( $menu_maybe->term_id, array( 'update_post_term_cache' => false ) ) ) { 128 $menu_items = wp_get_nav_menu_items( $menu_maybe->term_id, array( 'update_post_term_cache' => false ) ); 129 if ( $menu_items ) { 128 130 $menu = $menu_maybe; 129 131 break; … … 158 160 } 159 161 160 $nav_menu = $items = ''; 162 $nav_menu = ''; 163 $items = ''; 161 164 162 165 $show_container = false; … … 182 185 _wp_menu_item_classes_by_context( $menu_items ); 183 186 184 $sorted_menu_items = $menu_items_with_children = array(); 187 $sorted_menu_items = array(); 188 $menu_items_with_children = array(); 185 189 foreach ( (array) $menu_items as $menu_item ) { 186 190 $sorted_menu_items[ $menu_item->menu_order ] = $menu_item;
Note: See TracChangeset
for help on using the changeset viewer.