From 00ade45fd1eae8f7073f45fad38e97b3f37d35d3 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 10 Oct 2015 15:45:25 +0000 Subject: [PATCH] Docs: some `@global object` vernaculars should be converted to the actual object type. See #33491. Built from https://develop.svn.wordpress.org/trunk@35013 git-svn-id: http://core.svn.wordpress.org/trunk@34978 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/ms.php | 4 ++-- wp-includes/admin-bar.php | 2 +- wp-includes/class-walker-comment.php | 4 ++-- wp-includes/comment-functions.php | 2 +- wp-includes/comment-template.php | 18 +++++++++--------- wp-includes/template.php | 2 +- wp-includes/version.php | 2 +- wp-settings.php | 14 +++++++------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index f0daf5692e..6125ac116e 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -317,8 +317,8 @@ All at ###SITENAME### * * @since 3.0.0 * - * @global object $errors WP_Error object. - * @global object $wpdb WordPress database object. + * @global WP_Error $errors WP_Error object. + * @global wpdb $wpdb WordPress database object. */ function send_confirmation_on_profile_email() { global $errors, $wpdb; diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php index 696c369978..fbe341f300 100644 --- a/wp-includes/admin-bar.php +++ b/wp-includes/admin-bar.php @@ -530,7 +530,7 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) { * * @since 3.1.0 * - * @global object $tag + * @global WP_Term $tag * @global WP_Query $wp_the_query * * @param WP_Admin_Bar $wp_admin_bar diff --git a/wp-includes/class-walker-comment.php b/wp-includes/class-walker-comment.php index 27ec75a1a3..e82ec669e4 100644 --- a/wp-includes/class-walker-comment.php +++ b/wp-includes/class-walker-comment.php @@ -154,8 +154,8 @@ class Walker_Comment extends Walker { * @see Walker::start_el() * @see wp_list_comments() * - * @global int $comment_depth - * @global object $comment + * @global int $comment_depth + * @global WP_Comment $comment * * @param string $output Passed by reference. Used to append additional content. * @param object $comment Comment data object. diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php index 261a1f4483..9ffd077cd1 100644 --- a/wp-includes/comment-functions.php +++ b/wp-includes/comment-functions.php @@ -162,7 +162,7 @@ function get_approved_comments( $post_id, $args = array() ) { * * @since 2.0.0 * - * @global object $comment + * @global WP_Comment $comment * * @param WP_Comment|string|int $comment Comment to retrieve. * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants. diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 097baf56f3..6174c0c1df 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -1219,15 +1219,15 @@ function wp_comment_form_unfiltered_html_nonce() { * * @since 1.5.0 * - * @global WP_Query $wp_query - * @global WP_Post $post - * @global wpdb $wpdb - * @global int $id - * @global object $comment - * @global string $user_login - * @global int $user_ID - * @global string $user_identity - * @global bool $overridden_cpage + * @global WP_Query $wp_query + * @global WP_Post $post + * @global wpdb $wpdb + * @global int $id + * @global WP_Comment $comment + * @global string $user_login + * @global int $user_ID + * @global string $user_identity + * @global bool $overridden_cpage * * @param string $file Optional. The file to load. Default '/comments.php'. * @param bool $separate_comments Optional. Whether to separate the comments by comment type. diff --git a/wp-includes/template.php b/wp-includes/template.php index b6fe475a8a..620d89dc39 100644 --- a/wp-includes/template.php +++ b/wp-includes/template.php @@ -538,7 +538,7 @@ function locate_template($template_names, $load = false, $require_once = true ) * @global string $wp_version * @global WP $wp * @global int $id - * @global object $comment + * @global WP_Comment $comment * @global int $user_ID * * @param string $_template_file Path to template file. diff --git a/wp-includes/version.php b/wp-includes/version.php index 8268d80a18..60926dbc89 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-35012'; +$wp_version = '4.4-alpha-35013'; /** * 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 e0e39754ea..1c5da84923 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -262,7 +262,7 @@ do_action( 'sanitize_comment_cookies' ); /** * WordPress Query object - * @global object $wp_the_query + * @global WP_Query $wp_the_query * @since 2.0.0 */ $GLOBALS['wp_the_query'] = new WP_Query(); @@ -270,35 +270,35 @@ $GLOBALS['wp_the_query'] = new WP_Query(); /** * Holds the reference to @see $wp_the_query * Use this global for WordPress queries - * @global object $wp_query + * @global WP_Query $wp_query * @since 1.5.0 */ $GLOBALS['wp_query'] = $GLOBALS['wp_the_query']; /** * Holds the WordPress Rewrite object for creating pretty URLs - * @global object $wp_rewrite + * @global WP_Rewrite $wp_rewrite * @since 1.5.0 */ $GLOBALS['wp_rewrite'] = new WP_Rewrite(); /** * WordPress Object - * @global object $wp + * @global WP $wp * @since 2.0.0 */ $GLOBALS['wp'] = new WP(); /** * WordPress Widget Factory Object - * @global object $wp_widget_factory + * @global WP_Widget_Factory $wp_widget_factory * @since 2.8.0 */ $GLOBALS['wp_widget_factory'] = new WP_Widget_Factory(); /** * WordPress User Roles - * @global object $wp_roles + * @global WP_Roles $wp_roles * @since 2.0.0 */ $GLOBALS['wp_roles'] = new WP_Roles(); @@ -327,7 +327,7 @@ require_once( ABSPATH . WPINC . '/locale.php' ); /** * WordPress Locale object for loading locale domain date and various strings. - * @global object $wp_locale + * @global WP_Locale $wp_locale * @since 2.1.0 */ $GLOBALS['wp_locale'] = new WP_Locale();