Skip to content

Commit 2776f03

Browse files
authored
Merge branch 'trunk' into html-api/set-mod-html-leading-newlines-textarea
2 parents 773b739 + 33ebdd7 commit 2776f03

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://develop.svn.wordpress.org/trunk"
88
},
99
"gutenberg": {
10-
"ref": "23b566c72e9c4a36219ef5d6e62890f05551f6cb"
10+
"ref": "022d8dd3d461f91b15c1f0410649d3ebb027207f"
1111
},
1212
"engines": {
1313
"node": ">=20.10.0",

src/wp-admin/includes/network.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@ function network_step1( $errors = false ) {
198198
} else {
199199
$subdomain_install = false;
200200
$got_mod_rewrite = got_mod_rewrite();
201+
$message_class = '';
202+
$message = '';
203+
201204
if ( $got_mod_rewrite ) { // Dangerous assumptions.
202205
$message_class = 'updated';
203206
$message = '<p><strong>' . __( 'Warning:' ) . '</strong> ';

src/wp-includes/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @global string $wp_version
1818
*/
19-
$wp_version = '7.0-beta1-61709-src';
19+
$wp_version = '7.0-beta2-61752-src';
2020

2121
/**
2222
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

0 commit comments

Comments
 (0)