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

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
This commit is contained in:
Scott Taylor 2015-10-10 15:45:25 +00:00
parent 57c2ef2655
commit 00ade45fd1
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,8 +317,8 @@ All at ###SITENAME###
* *
* @since 3.0.0 * @since 3.0.0
* *
* @global object $errors WP_Error object. * @global WP_Error $errors WP_Error object.
* @global object $wpdb WordPress database object. * @global wpdb $wpdb WordPress database object.
*/ */
function send_confirmation_on_profile_email() { function send_confirmation_on_profile_email() {
global $errors, $wpdb; global $errors, $wpdb;

2
wp-includes/admin-bar.php
View File

@ -530,7 +530,7 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
* *
* @since 3.1.0 * @since 3.1.0
* *
* @global object $tag * @global WP_Term $tag
* @global WP_Query $wp_the_query * @global WP_Query $wp_the_query
* *
* @param WP_Admin_Bar $wp_admin_bar * @param WP_Admin_Bar $wp_admin_bar

4
wp-includes/class-walker-comment.php
View File

@ -154,8 +154,8 @@ class Walker_Comment extends Walker {
* @see Walker::start_el() * @see Walker::start_el()
* @see wp_list_comments() * @see wp_list_comments()
* *
* @global int $comment_depth * @global int $comment_depth
* @global object $comment * @global WP_Comment $comment
* *
* @param string $output Passed by reference. Used to append additional content. * @param string $output Passed by reference. Used to append additional content.
* @param object $comment Comment data object. * @param object $comment Comment data object.

2
wp-includes/comment-functions.php
View File

@ -162,7 +162,7 @@ function get_approved_comments( $post_id, $args = array() ) {
* *
* @since 2.0.0 * @since 2.0.0
* *
* @global object $comment * @global WP_Comment $comment
* *
* @param WP_Comment|string|int $comment Comment to retrieve. * @param WP_Comment|string|int $comment Comment to retrieve.
* @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants. * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.

18
wp-includes/comment-template.php
View File

@ -1219,15 +1219,15 @@ function wp_comment_form_unfiltered_html_nonce() {
* *
* @since 1.5.0 * @since 1.5.0
* *
* @global WP_Query $wp_query * @global WP_Query $wp_query
* @global WP_Post $post * @global WP_Post $post
* @global wpdb $wpdb * @global wpdb $wpdb
* @global int $id * @global int $id
* @global object $comment * @global WP_Comment $comment
* @global string $user_login * @global string $user_login
* @global int $user_ID * @global int $user_ID
* @global string $user_identity * @global string $user_identity
* @global bool $overridden_cpage * @global bool $overridden_cpage
* *
* @param string $file Optional. The file to load. Default '/comments.php'. * @param string $file Optional. The file to load. Default '/comments.php'.
* @param bool $separate_comments Optional. Whether to separate the comments by comment type. * @param bool $separate_comments Optional. Whether to separate the comments by comment type.

2
wp-includes/template.php
View File

@ -538,7 +538,7 @@ function locate_template($template_names, $load = false, $require_once = true )
* @global string $wp_version * @global string $wp_version
* @global WP $wp * @global WP $wp
* @global int $id * @global int $id
* @global object $comment * @global WP_Comment $comment
* @global int $user_ID * @global int $user_ID
* *
* @param string $_template_file Path to template file. * @param string $_template_file Path to template file.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

14
wp-settings.php
View File

@ -262,7 +262,7 @@ do_action( 'sanitize_comment_cookies' );
/** /**
* WordPress Query object * WordPress Query object
* @global object $wp_the_query * @global WP_Query $wp_the_query
* @since 2.0.0 * @since 2.0.0
*/ */
$GLOBALS['wp_the_query'] = new WP_Query(); $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 * Holds the reference to @see $wp_the_query
* Use this global for WordPress queries * Use this global for WordPress queries
* @global object $wp_query * @global WP_Query $wp_query
* @since 1.5.0 * @since 1.5.0
*/ */
$GLOBALS['wp_query'] = $GLOBALS['wp_the_query']; $GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
/** /**
* Holds the WordPress Rewrite object for creating pretty URLs * Holds the WordPress Rewrite object for creating pretty URLs
* @global object $wp_rewrite * @global WP_Rewrite $wp_rewrite
* @since 1.5.0 * @since 1.5.0
*/ */
$GLOBALS['wp_rewrite'] = new WP_Rewrite(); $GLOBALS['wp_rewrite'] = new WP_Rewrite();
/** /**
* WordPress Object * WordPress Object
* @global object $wp * @global WP $wp
* @since 2.0.0 * @since 2.0.0
*/ */
$GLOBALS['wp'] = new WP(); $GLOBALS['wp'] = new WP();
/** /**
* WordPress Widget Factory Object * WordPress Widget Factory Object
* @global object $wp_widget_factory * @global WP_Widget_Factory $wp_widget_factory
* @since 2.8.0 * @since 2.8.0
*/ */
$GLOBALS['wp_widget_factory'] = new WP_Widget_Factory(); $GLOBALS['wp_widget_factory'] = new WP_Widget_Factory();
/** /**
* WordPress User Roles * WordPress User Roles
* @global object $wp_roles * @global WP_Roles $wp_roles
* @since 2.0.0 * @since 2.0.0
*/ */
$GLOBALS['wp_roles'] = new WP_Roles(); $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. * WordPress Locale object for loading locale domain date and various strings.
* @global object $wp_locale * @global WP_Locale $wp_locale
* @since 2.1.0 * @since 2.1.0
*/ */
$GLOBALS['wp_locale'] = new WP_Locale(); $GLOBALS['wp_locale'] = new WP_Locale();