Changeset 26634

Timestamp:

12/04/2013 08:36:10 PM (12 years ago)

Author:

SergeyBiryukov

Message:

Avoid a PHP notice on Edit Menus screen when a menu is attached to a non-existing location.

props nofearinc.
fixes #26287.

File:

• trunk/src/wp-admin/nav-menus.php (modified) (2 diffs)

trunk/src/wp-admin/nav-menus.php

@@ -631 +631 @@
                             $locations_assigned_to_this_menu = array();
                             foreach ( array_keys( $menu_locations, $_nav_menu->term_id ) as $menu_location_key ) {
-                                 $locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
+                                if ( isset( $locations[ $menu_location_key ] ) ) {
+                                    $locations_assigned_to_this_menu[] = $locations[ $menu_location_key ];
+                                }
                             }
 
@@ -644 +646 @@
 
                             // Adds ellipses following the number of locations defined in $assigned_locations
-                            printf( ' (%1$s%2$s)',
-                                implode( ', ', $assigned_locations ),
-                                count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' …' : ''
-                            );
+                            if ( ! empty( $assigned_locations ) ) {
+                                printf( ' (%1$s%2$s)',
+                                    implode( ', ', $assigned_locations ),
+                                    count( $locations_assigned_to_this_menu ) > count( $assigned_locations ) ? ' …' : ''
+                                );
+                            }
                         }
                         ?>