From ad1feed450ea9e469e6cbbe4e86ad3959ed49a24 Mon Sep 17 00:00:00 2001 From: Andrew Nacin Date: Thu, 5 Sep 2013 18:48:26 +0000 Subject: [PATCH] Stop using get_blogaddress_by_domain() when updating the siteurl/homeurl from the network admin. props jeremyfelt, SergeyBiryukov. fixes #18242. see #25235. git-svn-id: https://develop.svn.wordpress.org/trunk@25261 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/network/site-info.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php index 7dd6aeb23a..38bed75800 100644 --- a/src/wp-admin/network/site-info.php +++ b/src/wp-admin/network/site-info.php @@ -50,7 +50,7 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] ) { switch_to_blog( $id ); if ( isset( $_POST['update_home_url'] ) && $_POST['update_home_url'] == 'update' ) { - $blog_address = get_blogaddress_by_domain( $_POST['blog']['domain'], $_POST['blog']['path'] ); + $blog_address = esc_url_raw( $_POST['blog']['domain'] . $_POST['blog']['path'] ); if ( get_option( 'siteurl' ) != $blog_address ) update_option( 'siteurl', $blog_address );