Ticket #17443: 17443.3.patch

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

@@ -92 +92 @@
                 <div id="wpadminbar">
                         <div class="quicklinks">
                                 <ul>
-                                        <?php foreach ( (array) $this->menu as $id => $menu_item ) : ?>
+                                        <?php foreach ( $this->menu as $id => $menu_item ) : ?>
                                                 <?php $this->recursive_render( $id, $menu_item ) ?>
                                         <?php endforeach; ?>
                                 </ul>
@@ -112 +112 @@
         }
 
         /* Helpers */
-        function recursive_render( $id, &$menu_item ) { ?>
+        function recursive_render( $id, $menu_item ) { ?>
                 <?php
                 $is_parent =  ! empty( $menu_item['children'] );
 
@@ -161 +161 @@
                 </li><?php
         }
 
-        function add_node( $parent_id, &$menu, $child ) {
+        function add_node( $parent_id, $menu, $child ) {
                 foreach( $menu as $id => $menu_item ) {
                         if ( $parent_id == $id ) {
                                 $menu->{$parent_id}['children']->{$child['id']} = $child;
@@ -194 +194 @@
                 do_action( 'add_admin_bar_menus' );
         }
 
-        function remove_node( $id, &$menu ) {
+        function remove_node( $id, $menu ) {
                 if ( isset( $menu->$id ) ) {
                         unset( $menu->$id );
                         return true;

wp-includes/admin-bar.php

@@ -57 +57 @@
 
         $wp_admin_bar->load_user_locale_translations();
 
-        do_action_ref_array( 'admin_bar_menu', array( &$wp_admin_bar ) );
+        do_action( 'admin_bar_menu', $wp_admin_bar );
 
         do_action( 'wp_before_admin_bar_render' );