Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Networks and Sites: Use warning styles for 'Caution' and 'Warning' messages during Multisite installation.

Browse Source 
Props dlh.
Fixes #49186.
Built from https://develop.svn.wordpress.org/trunk@47067


git-svn-id: http://core.svn.wordpress.org/trunk@46867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-01-13 17:00:06 +00:00
parent 9fa4cce9c2
commit f18b173674
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/network.php
View File

@ -122,7 +122,7 @@ function network_step1( $errors = false ) {
$active_plugins = get_option( 'active_plugins' ); $active_plugins = get_option( 'active_plugins' );
if ( ! empty( $active_plugins ) ) { if ( ! empty( $active_plugins ) ) {
echo '<div class="updated"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf( echo '<div class="notice notice-warning"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf(
/* translators: %s: URL to Plugins screen. */ /* translators: %s: URL to Plugins screen. */
__( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ), __( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ),
admin_url( 'plugins.php?plugin_status=active' ) admin_url( 'plugins.php?plugin_status=active' )
@ -434,7 +434,7 @@ function network_step2( $errors = false ) {
?> ?>
<h3><?php esc_html_e( 'Enabling the Network' ); ?></h3> <h3><?php esc_html_e( 'Enabling the Network' ); ?></h3>
<p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p> <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p>
<div class="updated inline"><p> <div class="notice notice-warning inline"><p>
<?php <?php
if ( file_exists( $home_path . '.htaccess' ) ) { if ( file_exists( $home_path . '.htaccess' ) ) {
echo '<strong>' . __( 'Caution:' ) . '</strong> '; echo '<strong>' . __( 'Caution:' ) . '</strong> ';

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-47066'; $wp_version = '5.4-alpha-47067';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.