Ticket #18049: diff

wp-includes/user.php

@@ -657 +657 @@
         if ( !is_multisite() ) {
                 $blog_id = get_current_blog_id();
                 $blogs = array();
+                $blogs[ $blog_id ] = (object) $blogs[ $blog_id ];
                 $blogs[ $blog_id ]->userblog_id = $blog_id;
                 $blogs[ $blog_id ]->blogname = get_option('blogname');
                 $blogs[ $blog_id ]->domain = '';

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

@@ -164 +164 @@
         function add_node( $parent_id, &$menu, $child ) {
                 foreach( $menu as $id => $menu_item ) {
                         if ( $parent_id == $id ) {
+                            $menu->{$parent_id}['children'] = (object) $menu->{$parent_id}['children'];
                                 $menu->{$parent_id}['children']->{$child['id']} = $child;
                                 $child = null;
                                 return true;

wp-admin/includes/theme.php

@@ -20 +20 @@
                 delete_option( 'current_theme' );
                 $current_theme = get_current_theme();
         }
+        $ct = new stdClass();
         $ct->name = $current_theme;
         $ct->title = $themes[$current_theme]['Title'];
         $ct->version = $themes[$current_theme]['Version'];