Ticket #16005: 16005.2.diff

class-wp-admin-bar.php

@@ -113 +113 @@
 
         /* Helpers */
         function recursive_render( $id, &$menu_item ) { ?>
-                <?php $menuclass = ( ! empty( $menu_item['children'] ) ) ? 'menupop ' : ''; ?>
+                <?php
+                if( null == $menu_item )
+                        return;
 
+                $menuclass = ( ! empty( $menu_item['children'] ) ) ? 'menupop ' : '';
+                ?>
+
                 <li class="<?php echo $menuclass . "ab-$id" ?><?php
                         if ( ! empty( $menu_item['meta']['class'] ) ) :
                                 echo ' ' . $menu_item['meta']['class'];
@@ -192 +197 @@
         function remove_node( $id, &$menu ) {
                 foreach( $menu as $menu_item_id => &$menu_item ) {
                         if ( $menu_item_id == $id ) {
-                                $menu_item = null;
+                                unset( $menu_item );
                                 return true;
                         }