From ea606165a55d6c4bce6be6719650506645696cbb Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 4 Aug 2019 01:28:55 +0000 Subject: [PATCH] Docs: Add missing description for `$wp` global. See #45604, #47110. Built from https://develop.svn.wordpress.org/trunk@45736 git-svn-id: http://core.svn.wordpress.org/trunk@45547 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/class-wp-rewrite.php | 2 +- wp-includes/class-wp-taxonomy.php | 2 +- wp-includes/functions.php | 2 +- wp-includes/rest-api.php | 2 +- wp-includes/rewrite.php | 4 ++-- wp-includes/template.php | 2 +- wp-includes/version.php | 2 +- wp-settings.php | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wp-includes/class-wp-rewrite.php b/wp-includes/class-wp-rewrite.php index f198225b97..f7f4468f54 100644 --- a/wp-includes/class-wp-rewrite.php +++ b/wp-includes/class-wp-rewrite.php @@ -1672,7 +1672,7 @@ class WP_Rewrite { * @since 4.3.0 Added support for skipping query var registration by passing `false` to `$query_var`. * * @see add_rewrite_endpoint() for full documentation. - * @global WP $wp + * @global WP $wp Current WordPress environment instance. * * @param string $name Name of the endpoint. * @param int $places Endpoint mask describing the places the endpoint should be added. diff --git a/wp-includes/class-wp-taxonomy.php b/wp-includes/class-wp-taxonomy.php index 724fc00fee..716da8d384 100644 --- a/wp-includes/class-wp-taxonomy.php +++ b/wp-includes/class-wp-taxonomy.php @@ -217,7 +217,7 @@ final class WP_Taxonomy { * * @since 4.7.0 * - * @global WP $wp WP instance. + * @global WP $wp Current WordPress environment instance. * * @param string $taxonomy Taxonomy key, must not exceed 32 characters. * @param array|string $object_type Name of the object type for the taxonomy object. diff --git a/wp-includes/functions.php b/wp-includes/functions.php index a2070c1ec7..c3dadd9312 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1112,7 +1112,7 @@ function wp_remote_fopen( $uri ) { * * @since 2.0.0 * - * @global WP $wp_locale + * @global WP $wp Current WordPress environment instance. * @global WP_Query $wp_query * @global WP_Query $wp_the_query * diff --git a/wp-includes/rest-api.php b/wp-includes/rest-api.php index cb10e27262..7602dd7405 100644 --- a/wp-includes/rest-api.php +++ b/wp-includes/rest-api.php @@ -283,7 +283,7 @@ function create_initial_rest_routes() { * * @since 4.4.0 * - * @global WP $wp Current WordPress environment instance. + * @global WP $wp Current WordPress environment instance. */ function rest_api_loaded() { if ( empty( $GLOBALS['wp']->query_vars['rest_route'] ) ) { diff --git a/wp-includes/rewrite.php b/wp-includes/rewrite.php index 6702036d0d..a01b88b9dc 100644 --- a/wp-includes/rewrite.php +++ b/wp-includes/rewrite.php @@ -150,7 +150,7 @@ function add_rewrite_rule( $regex, $query, $after = 'bottom' ) { * @since 2.1.0 * * @global WP_Rewrite $wp_rewrite WordPress rewrite component. - * @global WP $wp + * @global WP $wp Current WordPress environment instance. * * @param string $tag Name of the new rewrite tag. * @param string $regex Regular expression to substitute the tag for in rewrite rules. @@ -460,7 +460,7 @@ function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) { * @since 1.0.0 * * @global WP_Rewrite $wp_rewrite WordPress rewrite component. - * @global WP $wp + * @global WP $wp Current WordPress environment instance. * * @param string $url Permalink to check. * @return int Post ID, or 0 on failure. diff --git a/wp-includes/template.php b/wp-includes/template.php index 3aa79abeca..11fd37a3a4 100644 --- a/wp-includes/template.php +++ b/wp-includes/template.php @@ -690,7 +690,7 @@ function locate_template( $template_names, $load = false, $require_once = true ) * @global WP_Rewrite $wp_rewrite WordPress rewrite component. * @global wpdb $wpdb WordPress database abstraction object. * @global string $wp_version - * @global WP $wp + * @global WP $wp Current WordPress environment instance. * @global int $id * @global WP_Comment $comment * @global int $user_ID diff --git a/wp-includes/version.php b/wp-includes/version.php index 6563cce52c..355befab19 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3-alpha-45735'; +$wp_version = '5.3-alpha-45736'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index 26d7cc75d3..9a53ad8bae 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -431,7 +431,7 @@ $GLOBALS['wp_rewrite'] = new WP_Rewrite(); /** * WordPress Object * - * @global WP $wp + * @global WP $wp Current WordPress environment instance. * @since 2.0.0 */ $GLOBALS['wp'] = new WP();