Ticket #37026: 37026.patch

wp-admin/nav-menus.php

@@ -830 +830 @@
                                                                                         <input type="checkbox"<?php checked( isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id ); ?> name="menu-locations[<?php echo esc_attr( $location ); ?>]" id="locations-<?php echo esc_attr( $location ); ?>" value="<?php echo esc_attr( $nav_menu_selected_id ); ?>" />
                                                                                         <label for="locations-<?php echo esc_attr( $location ); ?>"><?php echo $description; ?></label>
                                                                                         <?php if ( ! empty( $menu_locations[ $location ] ) && $menu_locations[ $location ] != $nav_menu_selected_id ) : ?>
-                                                                                                <span class="theme-location-set"><?php
-                                                                                                        /* translators: %s: menu name */
-                                                                                                        printf( _x( '(Currently set to: %s)', 'menu location' ),
-                                                                                                                wp_get_nav_menu_object( $menu_locations[ $location ] )->name
-                                                                                                        );
-                                                                                                ?></span>
+                                                                                                <?php $menu = wp_get_nav_menu_object( $menu_locations[ $location ] ); ?>
+                                                                                                <?php if ( $menu && ! is_wp_error( $menu ) ) : ?>
+                                                                                                        <span class="theme-location-set"><?php
+                                                                                                                /* translators: %s: menu name */
+                                                                                                                printf( _x( '(Currently set to: %s)', 'menu location' ),
+                                                                                                                        $menu->name
+                                                                                                                );
+                                                                                                        ?></span>
+                                                                                                <?php endif; ?>
                                                                                         <?php endif; ?>
                                                                                 </dd>
                                                                                 <?php endforeach; ?>