Merge branch 'trunk' into 64672-command-palette-admin-bar

Author: t-hamano

src/wp-admin/includes/network.php

@@ -198,6 +198,9 @@ function network_step1( $errors = false ) {
 	} else {
 		$subdomain_install = false;
 		$got_mod_rewrite   = got_mod_rewrite();
+		$message_class     = '';
+		$message           = '';
+
 		if ( $got_mod_rewrite ) { // Dangerous assumptions.
 			$message_class = 'updated';
 			$message       = '<p><strong>' . __( 'Warning:' ) . '</strong> ';

src/wp-includes/version.php

@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '7.0-beta2-src';
+$wp_version = '7.0-beta2-61752-src';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.