Remove a now unused switch_to_blog() and restore_current_blog() in site-info.php

jeremyfelt · jeremyfelt · commit 2cdea6f446b9 · 2015-06-14T08:22:34.000Z
Now that we decide when to automatically update `home` and `siteurl`, we no longer need to switch to the site while displaying the form output. See #32503. git-svn-id: https://develop.svn.wordpress.org/trunk@32761 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php
@@ -158,8 +158,6 @@
 		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
 	}
 }
-
-switch_to_blog( $id );
 ?>
 <form method="post" action="site-info.php?action=update-site">
 	<?php wp_nonce_field( 'edit-site' ); ?>
@@ -230,5 +228,4 @@
 
 </div>
 <?php
-restore_current_blog();
 require( ABSPATH . 'wp-admin/admin-footer.php' );

Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,6 @@`
`158`	`158`	`echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';`
`159`	`159`	`}`
`160`	`160`	`}`
`161`		`-`
`162`		`-switch_to_blog( $id );`
`163`	`161`	`?>`
`164`	`162`	`<form method="post" action="site-info.php?action=update-site">`
`165`	`163`	`<?php wp_nonce_field( 'edit-site' ); ?>`
`@@ -230,5 +228,4 @@`
`230`	`228`
`231`	`229`	`</div>`
`232`	`230`	`<?php`
`233`		`-restore_current_blog();`
`234`	`231`	`require( ABSPATH . 'wp-admin/admin-footer.php' );`