From 8daec045572cb268c01a4bc349bd489d3618a627 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Sun, 14 Jun 2015 08:23:26 +0000
Subject: [PATCH] Remove a now unused `switch_to_blog()` and
 `restore_current_blog()` in site-info.php

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.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32732 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/site-info.php | 3 ---
 wp-includes/version.php        | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index ebe4c7bc88..446db733e4 100644
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -158,8 +158,6 @@ if ( ! empty( $messages ) ) {
 		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 @@ switch_to_blog( $id );
 
 </div>
 <?php
-restore_current_blog();
 require( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7226d4aabe..9dbd2493d8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-alpha-32760';
+$wp_version = '4.3-alpha-32761';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.