From 0e76a2c570ddc51132fafef53b346c4e2c0809f1 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Wed, 10 Jun 2015 07:28:26 +0000
Subject: [PATCH] Additional improvement to sites list table display

* Build `$blogname` identically when creating action link messaging.
* Remove the trailing slash from URLs for a better UI.

See #32434.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32689 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-ms-sites-list-table.php | 4 ++--
 wp-includes/version.php                            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php
index 587a018e61..9f15c3d60f 100644
--- a/wp-admin/includes/class-wp-ms-sites-list-table.php
+++ b/wp-admin/includes/class-wp-ms-sites-list-table.php
@@ -262,7 +262,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 			}
 			echo "<tr{$class}>";
 
-			$blogname = $blog['domain'] . $blog['path'];
+			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
 
 			list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
@@ -402,7 +402,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table {
 		global $current_site;
 
 		if ( $primary === $column_name ) {
-			$blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path'];
+			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
 
 			// Preordered.
 			$actions = array(
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e7f694a273..eed1ad2177 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32718';
+$wp_version = '4.3-alpha-32719';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.