Stop using get_blogaddress_by_domain() when updating the siteurl/homeurl from the network admin.

props jeremyfelt, SergeyBiryukov.
fixes #18242. see #25235.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-09-05 18:49:09 +00:00
parent 3971e0980e
commit 5cb01f0b9b
1 changed files with 1 additions and 1 deletions

View File

@ -50,7 +50,7 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] ) {
switch_to_blog( $id ); switch_to_blog( $id );
if ( isset( $_POST['update_home_url'] ) && $_POST['update_home_url'] == 'update' ) { 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 ) if ( get_option( 'siteurl' ) != $blog_address )
update_option( 'siteurl', $blog_address ); update_option( 'siteurl', $blog_address );