WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Text Changes: Correct "up-to-date" vs. "up to date" usage in a database update string and inline comments. 

* "Up to date" is an adverb phrase that describes an action that brings something in line with the latest information.
* "Up-to-date" is an adjective phrase that is used as a synonym for "current".

Props socalchristina, hareesh-pillai, garrett-eclipse, desrosj, aprea.
Fixes #38998.
Built from https://develop.svn.wordpress.org/trunk@46096


git-svn-id: http://core.svn.wordpress.org/trunk@45908 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2019-09-12 13:06:57 +00:00
parent cc6e23e4dc
commit 3591f1ad60
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -630,7 +630,7 @@ if ( ! function_exists( 'wp_upgrade' ) ) :
$wp_current_db_version = __get_option( 'db_version' ); $wp_current_db_version = __get_option( 'db_version' );
// We are up-to-date. Nothing to do. // We are up to date. Nothing to do.
if ( $wp_db_version == $wp_current_db_version ) { if ( $wp_db_version == $wp_current_db_version ) {
return; return;
} }
@ -687,7 +687,7 @@ function upgrade_all() {
global $wp_current_db_version, $wp_db_version; global $wp_current_db_version, $wp_db_version;
$wp_current_db_version = __get_option( 'db_version' ); $wp_current_db_version = __get_option( 'db_version' );
// We are up-to-date. Nothing to do. // We are up to date. Nothing to do.
if ( $wp_db_version == $wp_current_db_version ) { if ( $wp_db_version == $wp_current_db_version ) {
return; return;
} }

2
wp-admin/upgrade.php
View File

@ -73,7 +73,7 @@ header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option
<?php if ( get_option( 'db_version' ) == $wp_db_version || ! is_blog_installed() ) : ?> <?php if ( get_option( 'db_version' ) == $wp_db_version || ! is_blog_installed() ) : ?>
<h1><?php _e( 'No Update Required' ); ?></h1> <h1><?php _e( 'No Update Required' ); ?></h1>
<p><?php _e( 'Your WordPress database is already up-to-date!' ); ?></p> <p><?php _e( 'Your WordPress database is already up to date!' ); ?></p>
<p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p> <p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
<?php <?php

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-46095'; $wp_version = '5.3-alpha-46096';
/** /**
* 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.