diff --git a/wp-admin/includes/class-core-upgrader.php b/wp-admin/includes/class-core-upgrader.php index 2073ebd4e6..7c782606d3 100644 --- a/wp-admin/includes/class-core-upgrader.php +++ b/wp-admin/includes/class-core-upgrader.php @@ -386,8 +386,8 @@ class Core_Upgrader extends WP_Upgrader { * * @since 3.7.0 * - * @global string $wp_version - * @global string $wp_local_package + * @global string $wp_version The WordPress version string. + * @global string $wp_local_package Locale code of the package. * * @return bool True if the checksums match, otherwise false. */ diff --git a/wp-admin/includes/translation-install.php b/wp-admin/includes/translation-install.php index 5d15b22f66..7de027045b 100644 --- a/wp-admin/includes/translation-install.php +++ b/wp-admin/includes/translation-install.php @@ -154,7 +154,7 @@ function wp_get_available_translations() { * * @since 4.0.0 * - * @global string $wp_local_package + * @global string $wp_local_package Locale code of the package. * * @param array[] $languages Array of available languages (populated via the Translation API). */ diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index fa5858ac41..9dbe8bead1 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -1380,7 +1380,7 @@ function _copy_dir( $from, $to, $skip_list = array() ) { * * @since 3.3.0 * - * @global string $wp_version + * @global string $wp_version The WordPress version string. * @global string $pagenow * @global string $action * diff --git a/wp-admin/install.php b/wp-admin/install.php index 5380f8b74d..2168c03e18 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -223,9 +223,9 @@ if ( is_blog_installed() ) { } /** - * @global string $wp_version - * @global string $required_php_version - * @global string $required_mysql_version + * @global string $wp_version The WordPress version string. + * @global string $required_php_version The required PHP version string. + * @global string $required_mysql_version The required MySQL version string. */ global $wp_version, $required_php_version, $required_mysql_version; @@ -290,7 +290,7 @@ if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { } /** - * @global string $wp_local_package + * @global string $wp_local_package Locale code of the package. * @global WP_Locale $wp_locale WordPress date and time locale object. */ $language = ''; diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index f180ebb88b..7b38b9f412 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -87,7 +87,7 @@ $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1; * @ignore * @since 2.3.0 * - * @global string $wp_local_package + * @global string $wp_local_package Locale code of the package. * @global WP_Locale $wp_locale WordPress date and time locale object. * * @param string|array $body_classes diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index e3734bd90c..9d21ac8c2c 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -28,7 +28,7 @@ if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' * * @since 2.7.0 * - * @global string $wp_local_package + * @global string $wp_local_package Locale code of the package. * @global wpdb $wpdb WordPress database abstraction object. * * @staticvar bool $first_pass @@ -216,8 +216,8 @@ function dismissed_updates() { * * @since 2.7.0 * - * @global string $required_php_version - * @global string $required_mysql_version + * @global string $required_php_version The required PHP version string. + * @global string $required_mysql_version The required MySQL version string. */ function core_upgrade_preamble() { global $required_php_version, $required_mysql_version; diff --git a/wp-admin/upgrade.php b/wp-admin/upgrade.php index 88388ea60d..2d27f50c21 100644 --- a/wp-admin/upgrade.php +++ b/wp-admin/upgrade.php @@ -36,9 +36,9 @@ if ( 'upgrade_db' === $step ) { } /** - * @global string $wp_version - * @global string $required_php_version - * @global string $required_mysql_version + * @global string $wp_version The WordPress version string. + * @global string $required_php_version The required PHP version string. + * @global string $required_mysql_version The required MySQL version string. */ global $wp_version, $required_php_version, $required_mysql_version; diff --git a/wp-includes/class-wp-locale.php b/wp-includes/class-wp-locale.php index 578a87ad7d..de3745702d 100644 --- a/wp-includes/class-wp-locale.php +++ b/wp-includes/class-wp-locale.php @@ -115,7 +115,7 @@ class WP_Locale { * @since 2.1.0 * * @global string $text_direction - * @global string $wp_version + * @global string $wp_version The WordPress version string. */ public function init() { // The weekdays. diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 53fe900cd5..a2aa63b017 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -695,7 +695,7 @@ function bloginfo( $show = '' ) { * * @since 0.71 * - * @global string $wp_version + * @global string $wp_version The WordPress version string. * * @param string $show Optional. Site info to retrieve. Default empty (site name). * @param string $filter Optional. How to filter what is retrieved. Default 'raw'. diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 922eb027c8..4559263edb 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -22,8 +22,8 @@ * * @since 1.5.0 * - * @global string $locale - * @global string $wp_local_package + * @global string $locale The current locale. + * @global string $wp_local_package Locale code of the package. * * @return string The locale of the blog or from the {@see 'locale'} hook. */ diff --git a/wp-includes/update.php b/wp-includes/update.php index 09000c794c..520f7943a0 100644 --- a/wp-includes/update.php +++ b/wp-includes/update.php @@ -16,7 +16,7 @@ * @since 2.3.0 * @global string $wp_version Used to check against the newest WordPress version. * @global wpdb $wpdb WordPress database abstraction object. - * @global string $wp_local_package + * @global string $wp_local_package Locale code of the package. * * @param array $extra_stats Extra statistics to report to the WordPress.org API. * @param bool $force_check Whether to bypass the transient cache and force a fresh update check. Defaults to false, true if $extra_stats is set. @@ -251,7 +251,7 @@ function wp_version_check( $extra_stats = array(), $force_check = false ) { * api.wordpress.org. Will only check if WordPress isn't installing. * * @since 2.3.0 - * @global string $wp_version Used to notify the WordPress version. + * @global string $wp_version The WordPress version string. * * @param array $extra_stats Extra statistics to report to the WordPress.org API. */ @@ -432,6 +432,7 @@ function wp_update_plugins( $extra_stats = array() ) { * installing. * * @since 2.7.0 + * @global string $wp_version The WordPress version string. * * @param array $extra_stats Extra statistics to report to the WordPress.org API. */ @@ -725,7 +726,7 @@ function wp_get_update_data() { * * @since 2.8.0 * - * @global string $wp_version + * @global string $wp_version The WordPress version string. */ function _maybe_update_core() { // Include an unmodified $wp_version. diff --git a/wp-includes/version.php b/wp-includes/version.php index 10a9e9377e..e96e7c6317 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -9,11 +9,11 @@ */ /** - * The WordPress version string + * The WordPress version string. * * @global string $wp_version */ -$wp_version = '5.4-alpha-47229'; +$wp_version = '5.4-alpha-47230'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. @@ -23,21 +23,21 @@ $wp_version = '5.4-alpha-47229'; $wp_db_version = 47018; /** - * Holds the TinyMCE version + * Holds the TinyMCE version. * * @global string $tinymce_version */ $tinymce_version = '4960-20190918'; /** - * Holds the required PHP version + * Holds the required PHP version. * * @global string $required_php_version */ $required_php_version = '5.6.20'; /** - * Holds the required MySQL version + * Holds the required MySQL version. * * @global string $required_mysql_version */ diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 797403c34e..7239324547 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -597,7 +597,7 @@ class wpdb { * @link https://core.trac.wordpress.org/ticket/3354 * @since 2.0.8 * - * @global string $wp_version + * @global string $wp_version The WordPress version string. * * @param string $dbuser MySQL database user * @param string $dbpassword MySQL database password @@ -3489,8 +3489,8 @@ class wpdb { * * @since 2.5.0 * - * @global string $wp_version - * @global string $required_mysql_version + * @global string $wp_version The WordPress version string. + * @global string $required_mysql_version The required MySQL version string. * * @return void|WP_Error */