From 767ed1e9b1dae47b200bba81bf5680a37441d70e Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Sat, 4 Jul 2015 04:21:24 +0000 Subject: [PATCH] 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 --- wp-admin/includes/ms.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index c3b1e7637b..66fa2a060e 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -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 { diff --git a/wp-includes/version.php b/wp-includes/version.php index 31272dfdb9..ed6b02fc7e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -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.