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
This commit is contained in:
Andrew Nacin 2013-09-05 18:48:26 +00:00
parent d82fd6d7ce
commit ad1feed450

View File

@ -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 );