Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

I18N: Remove hardcoded constant from a translatable string in network_step1().

Browse Source 
Props ramiy.
Fixes #41652.
Built from https://develop.svn.wordpress.org/trunk@41923


git-svn-id: http://core.svn.wordpress.org/trunk@41757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2017-10-18 20:02:50 +00:00
parent 73dc2a45e3
commit a749494900
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,11 @@ function network_step1( $errors = false ) {
global $is_apache;
if ( defined('DO_NOT_UPGRADE_GLOBAL_TABLES') ) {
echo '<div class="error"><p><strong>' . __( 'ERROR:' ) . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
echo '<div class="error"><p><strong>' . __( 'ERROR:' ) . '</strong> ' . sprintf(
/* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
__( 'The constant %s cannot be defined when creating a network.' ),
'<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
) . '</p></div>';
echo '</div>';
include( ABSPATH . 'wp-admin/admin-footer.php' );
die();
@ -110,7 +114,11 @@ function network_step1( $errors = false ) {
$active_plugins = get_option( 'active_plugins' );
if ( ! empty( $active_plugins ) ) {
echo '<div class="updated"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf( __( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '</p></div><p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
echo '<div class="updated"><p><strong>' . __( 'Warning:' ) . '</strong> ' . sprintf(
/* translators: %s: Plugins screen URL */
__( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ),
admin_url( 'plugins.php?plugin_status=active' )
) . '</p></div><p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
echo '</div>';
include( ABSPATH . 'wp-admin/admin-footer.php' );
die();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9-beta2-41922';
$wp_version = '4.9-beta2-41923';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.