WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Provide all site flag data in objects returned by `get_blogs_of_user()` 

Previously, `archived`, `spam`, and `deleted` properties were forced to `0` when returned by `get_blogs_of_user()`. This was originally introduced in [21794] as a way to prevent notices when properties were expected.

Instead, we can properly fill these properties with those retrieved from `get_blog_details()`.

Props realloc.
Fixes #32281.

Built from https://develop.svn.wordpress.org/trunk@32626


git-svn-id: http://core.svn.wordpress.org/trunk@32596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2015-05-27 21:23:26 +00:00
parent 0a70901c50
commit 45ad4808d9
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/user.php
View File

@ -1175,9 +1175,9 @@ function get_blogs_of_user( $user_id, $all = false ) {
'path' => $blog->path, 'path' => $blog->path,
'site_id' => $blog->site_id, 'site_id' => $blog->site_id,
'siteurl' => $blog->siteurl, 'siteurl' => $blog->siteurl,
'archived' => 0, 'archived' => $blog->archived,
'spam' => 0, 'spam' => $blog->spam,
'deleted' => 0 'deleted' => $blog->deleted,
); );
} }
unset( $keys[ $wpdb->base_prefix . 'capabilities' ] ); unset( $keys[ $wpdb->base_prefix . 'capabilities' ] );
@ -1204,9 +1204,9 @@ function get_blogs_of_user( $user_id, $all = false ) {
'path' => $blog->path, 'path' => $blog->path,
'site_id' => $blog->site_id, 'site_id' => $blog->site_id,
'siteurl' => $blog->siteurl, 'siteurl' => $blog->siteurl,
'archived' => 0, 'archived' => $blog->archived,
'spam' => 0, 'spam' => $blog->spam,
'deleted' => 0 'deleted' => $blog->deleted,
); );
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32625'; $wp_version = '4.3-alpha-32626';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.