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

Use the full site URL in `choose_primary_blog()` when a user is a member of only one site. 

Aligns with the output used when a user is a member of multiple sites.

Fixes #32884.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33052 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Jeremy Felt 2015-07-04 04:21:24 +00:00
parent 5ab785b054
commit 767ed1e9b1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/ms.php
View File

@ -807,7 +807,7 @@ function choose_primary_blog() {
}
} elseif ( count( $all_blogs ) == 1 ) {
$blog = reset( $all_blogs );
echo $blog->domain;
echo esc_url( get_home_url( $blog->userblog_id ) );
if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
} else {

2
wp-includes/version.php
View File

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