Changeset 17184

Timestamp:

12/30/2010 07:04:32 PM (14 years ago)

Author:

ryan

Message:

Clean up admin bar node removal. Make it PHP4 safe and prevent display of blank spots. Props sorich87, SergeyBiryukov. fixes #16005

File:

• trunk/wp-includes/class-wp-admin-bar.php (modified) (1 diff)

trunk/wp-includes/class-wp-admin-bar.php

@@ -191 +191 @@
 
     function remove_node( $id, &$menu ) {
-        foreach( $menu as $menu_item_id => &$menu_item ) {
-            if ( $menu_item_id == $id ) {
-                $menu_item = null;
-                return true;
-            }
-
+        if ( isset( $menu->$id ) ) {
+            unset( $menu->$id );
+            return true;
+        }
+
+        foreach( $menu as $menu_item_id => $menu_item ) {
             if ( ! empty( $menu->{$menu_item_id}['children'] ) )
                 $this->remove_node( $id, $menu->{$menu_item_id}['children'] );