From d013c703e43c7d444be1993366b413fb275dd5b0 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 1 Apr 2015 18:00:28 +0000
Subject: [PATCH] Merge title strings on Edit Site screens.

props ramiy.
fixes #31844.
Built from https://develop.svn.wordpress.org/trunk@31962


git-svn-id: http://core.svn.wordpress.org/trunk@31941 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/site-info.php     | 4 ++--
 wp-admin/network/site-settings.php | 4 ++--
 wp-admin/network/site-themes.php   | 4 ++--
 wp-admin/network/site-users.php    | 4 ++--
 wp-includes/version.php            | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index 9c0e9d5b4c..37036c11d2 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -88,8 +88,8 @@ if ( isset($_GET['update']) ) {
 }
 
 $site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
-$title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
-$title = sprintf( __('Edit Site: %s'), $site_url_no_http );
+$title_site_url_linked = sprintf( __( 'Edit Site: %s' ), '<a href="' . get_blogaddress_by_id( $id ) . '">' . $site_url_no_http . '</a>' );
+$title = sprintf( __( 'Edit Site: %s' ), $site_url_no_http );
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php
index 828cebfb93..123c0cda18 100644
--- a/wp-admin/network/site-settings.php
+++ b/wp-admin/network/site-settings.php
@@ -76,8 +76,8 @@ if ( isset($_GET['update']) ) {
 }
 
 $site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
-$title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
-$title = sprintf( __('Edit Site: %s'), $site_url_no_http );
+$title_site_url_linked = sprintf( __( 'Edit Site: %s' ), '<a href="' . get_blogaddress_by_id( $id ) . '">' . $site_url_no_http . '</a>' );
+$title = sprintf( __( 'Edit Site: %s' ), $site_url_no_http );
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php
index edfad8eac3..2bf3c8f704 100644
--- a/wp-admin/network/site-themes.php
+++ b/wp-admin/network/site-themes.php
@@ -130,8 +130,8 @@ add_thickbox();
 add_screen_option( 'per_page' );
 
 $site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
-$title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
-$title = sprintf( __('Edit Site: %s'), $site_url_no_http );
+$title_site_url_linked = sprintf( __( 'Edit Site: %s' ), '<a href="' . get_blogaddress_by_id( $id ) . '">' . $site_url_no_http . '</a>' );
+$title = sprintf( __( 'Edit Site: %s' ), $site_url_no_http );
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php
index 3638f2b29d..0ff7e99d7c 100644
--- a/wp-admin/network/site-users.php
+++ b/wp-admin/network/site-users.php
@@ -158,8 +158,8 @@ if ( isset( $_GET['action'] ) && 'update-site' == $_GET['action'] ) {
 add_screen_option( 'per_page' );
 
 $site_url_no_http = preg_replace( '#^http(s)?://#', '', get_blogaddress_by_id( $id ) );
-$title_site_url_linked = sprintf( __('Edit Site: <a href="%1$s">%2$s</a>'), get_blogaddress_by_id( $id ), $site_url_no_http );
-$title = sprintf( __('Edit Site: %s'), $site_url_no_http );
+$title_site_url_linked = sprintf( __( 'Edit Site: %s' ), '<a href="' . get_blogaddress_by_id( $id ) . '">' . $site_url_no_http . '</a>' );
+$title = sprintf( __( 'Edit Site: %s' ), $site_url_no_http );
 
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e4798e0364..0dcfbfbfb2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta3-31961';
+$wp_version = '4.2-beta3-31962';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.