Ticket #30217: 30217.diff

src/wp-admin/export.php

@@ -112 +112 @@
 /**
  * Create the date options fields for exporting a given post type.
  *
- * @global wpdb      $wpdb      WordPress database object.
+ * @global wpdb      $wpdb      WordPress database abstraction object.
  * @global WP_Locale $wp_locale Date and Time Locale object.
  *
  * @since 3.1.0

src/wp-admin/includes/comment.php

@@ -10 +10 @@
  * Determine if a comment exists based on author and date.
  *
  * @since 2.0.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $comment_author Author of the comment
  * @param string $comment_date Date of the comment
  * @return mixed Comment post ID on success.
@@ -110 +111 @@
  * Get the number of pending comments on a post or posts
  *
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int|array $post_id Either a single Post ID or an array of Post IDs
  * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
  */

src/wp-admin/includes/schema.php

@@ -324 +324 @@
  * Create WordPress options and set the default values.
  *
  * @since 1.5.0
- * @uses $wpdb
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  * @uses $wp_db_version
  */
 function populate_options() {

src/wp-admin/install-helper.php

@@ -44 +44 @@
  *
  * @since 1.0.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $table_name Database table name.
  * @param string $create_ddl Create database table SQL.
@@ -76 +76 @@
  *
  * @since 1.0.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $table_name Database table name
  * @param string $column_name Table column name
@@ -110 +110 @@
  *
  * @since 1.0.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $table_name Table name
  * @param string $column_name Column name

src/wp-includes/bookmark.php

@@ -10 +10 @@
  * Retrieve Bookmark data
  *
  * @since 2.1.0
- * @uses $wpdb Database Object
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param mixed $bookmark
  * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
  * @param string $filter Optional, default is 'raw'.
@@ -91 +92 @@
  *
  * @since 2.1.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string|array $args {
  *     Optional. String or array of arguments to retrieve bookmarks.

src/wp-includes/canonical.php

@@ -512 +512 @@
  * Attempts to guess the correct URL based on query vars
  *
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @return bool|string The correct URL if one is found. False on failure.
  */
 function redirect_guess_404_permalink() {

src/wp-includes/capabilities.php

@@ -104 +104 @@
          *
          * @since 2.1.0
          * @access protected
-         * @uses $wpdb Used to get the database prefix.
+         *
+         * @global wpdb  $wpdb          WordPress database abstraction object.
          * @global array $wp_user_roles Used to set the 'roles' property value.
          */
         protected function _init() {

src/wp-includes/comment.php

@@ -24 +24 @@
  *
  * @since 1.2.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $author       Comment author name.
  * @param string $email        Comment author email.
@@ -155 +155 @@
  * comment variable will be used, if it is set.
  *
  * @since 2.0.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param object|string|int $comment Comment to retrieve.
  * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.
  * @return object|array|null Depends on $output value.
@@ -214 +215 @@
  * 'order', 'number', 'offset', and 'post_id'.
  *
  * @since 2.7.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param mixed $args Optional. Array or string of options to override defaults.
  * @return array List of comments.
  */
@@ -757 +759 @@
  * The date the last comment was modified.
  *
  * @since 1.5.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $timezone Which timezone to use in reference to 'gmt', 'blog',
  *              or 'server' locations.
  * @return string Last comment modified date.
@@ -797 +800 @@
  * caches, but this function does not.
  *
  * @since 2.0.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide.
  * @return array The amount of spam, approved, awaiting moderation, and total comments.
  */
@@ -1015 +1019 @@
  * Validates whether this comment is allowed to be made.
  *
  * @since 2.0.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param array $commentdata Contains information on the comment
  * @return mixed Signifies the approval status (0|1|'spam')
  */
@@ -1132 +1137 @@
  * administrators.
  *
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $ip Comment IP.
  * @param string $email Comment author email address.
  * @param string $date MySQL time string.
@@ -1435 +1441 @@
  * post ID available.
  *
  * @since 2.0.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int $comment_id Comment ID
  * @param bool $force_delete Whether to bypass trash and force deletion. Default is false.
  * @return bool True on success, false on failure.
@@ -1810 +1817 @@
  * 'comment_date_gmt', 'comment_parent', 'comment_approved', and 'user_id'.
  *
  * @since 2.0.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param array $commentdata Contains information on the comment.
  * @return int|bool The new comment's ID on success, false on failure.
  */
@@ -2105 +2113 @@
  * Filters the comment and makes sure certain fields are valid before updating.
  *
  * @since 2.0.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param array $commentarr Contains information on the comment.
  * @return int Comment was updated if value is 1, or was not updated if value is 0.
  */
@@ -2243 +2252 @@
  * Updates the comment count for the post.
  *
  * @since 2.5.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int $post_id Post ID
  * @return bool True on success, false on '0' $post_id or if post with ID does not exist.
  */
@@ -2357 +2367 @@
  * Perform all pingbacks, enclosures, trackbacks, and send to pingback services.
  *
  * @since 2.1.0
- * @uses $wpdb
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  */
 function do_all_pings() {
         global $wpdb;
@@ -2388 +2399 @@
  * Perform trackbacks.
  *
  * @since 1.5.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int $post_id Post ID to do trackbacks on.
  */
 function do_trackbacks($post_id) {
@@ -2562 +2574 @@
  * Updates database when sending trackback to prevent duplicates.
  *
  * @since 0.71
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $trackback_url URL to send trackbacks.
  * @param string $title Title of post.
  * @param string $excerpt Excerpt of post.

src/wp-includes/deprecated.php

@@ -2424 +2424 @@
  *
  * @since 2.2.0
  * @deprecated 3.1.0
- * @uses $wpdb WordPress database object for queries
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
  * @uses $blog_id The Blog id of the blog for those that use more than one blog
  *
  * @param int $id Blog ID.

src/wp-includes/functions.php

@@ -1087 +1087 @@
  *
  * @since 2.0.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @return int Number of database queries.
  */
@@ -1253 +1253 @@
  *
  * @since 2.1.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @return bool Whether the blog is already installed.
  */
@@ -3238 +3238 @@
  *
  * @since 2.3.2
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  */
 function dead_db() {
         global $wpdb;

src/wp-includes/media.php

@@ -3260 +3260 @@
  *
  * @since 4.0.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $url The URL to resolve.
  * @return int The found post ID.

src/wp-includes/meta.php

@@ -15 +15 @@
  * Add metadata for the specified object.
  *
  * @since 2.9.0
- * @uses $wpdb WordPress database object for queries.
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
  * @param string $meta_key Metadata key
@@ -128 +129 @@
  * ID and metadata key, the metadata will be added.
  *
  * @since 2.9.0
- * @uses $wpdb WordPress database object for queries.
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
  * @param string $meta_key Metadata key
@@ -278 +280 @@
  * Delete metadata for the specified object.
  *
  * @since 2.9.0
- * @uses $wpdb WordPress database object for queries.
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int $object_id ID of the object metadata is for
  * @param string $meta_key Metadata key
@@ -756 +759 @@
  * Update the metadata cache for the specified objects.
  *
  * @since 2.9.0
- * @uses $wpdb WordPress database object for queries.
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
  * @param int|array $object_ids array or comma delimited list of object IDs to update cache for
  * @return mixed Metadata cache for the specified objects, or false on failure.
@@ -1500 +1504 @@
  * Retrieve the name of the metadata table for the specified object type.
  *
  * @since 2.9.0
- * @uses $wpdb WordPress database object for queries.
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $type Type of object to get metadata table for (e.g., comment, post, or user)
  * @return mixed Metadata table name, or false if no metadata table exists
  */

src/wp-includes/pluggable.php

@@ -1484 +1484 @@
  *
  * @since 1.0.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $comment_id Comment ID
  * @return bool Always returns true
@@ -2064 +2064 @@
  *
  * @since 2.5.0
  *
- * @uses $wpdb WordPress database object for queries
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $password The plaintext new user password
  * @param int $user_id User ID

src/wp-includes/post.php

@@ -1789 +1789 @@
  *
  * @since 2.5.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int    $post_id   Optional. Post ID to change post type. Default 0.
  * @param string $post_type Optional. Post type. Accepts 'post' or 'page' to
@@ -2554 +2554 @@
  *
  * @since 1.0.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  * @see wp_delete_attachment()
  * @see wp_trash_post()
  *
@@ -2799 +2799 @@
  *
  * @since 2.9.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|WP_Post $post Optional. Post ID or post object. Defaults to global $post.
  * @return mixed False on failure.
@@ -4741 +4741 @@
  *
  * @since 2.0.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int  $post_id      Attachment ID.
  * @param bool $force_delete Optional. Whether to bypass trash and force deletion.
@@ -5430 +5430 @@
  *
  * @since 2.0.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|WP_Post $post Post ID or post object to remove from the cache.
  */
@@ -5588 +5588 @@
  * @access private
  *
  * @see wp_clear_scheduled_hook()
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string  $new_status New post status.
  * @param string  $old_status Previous post status.
@@ -5780 +5780 @@
  *
  * @since 3.4.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  */
 function wp_delete_auto_drafts() {
         global $wpdb;

src/wp-includes/query.php

@@ -2211 +2211 @@
          * @since 4.0.0
          * @access protected
          *
-         * @global wpdb $wpdb WordPress database access abstraction object.
+         * @global wpdb $wpdb WordPress database abstraction object.
          *
          * @param string $orderby Alias for the field to order by.
          * @return string|bool Table-prefixed value to used in the ORDER clause. False otherwise.
@@ -4619 +4619 @@
  * Attempts to find the current slug from the past slugs.
  *
  * @since 2.1.0
+ *
  * @uses $wp_query
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @return null If no link is found, null is returned.
  */

src/wp-includes/taxonomy.php

@@ -562 +562 @@
  *
  * @since 2.3.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|array $term_ids Term id or array of term ids of terms that will be used
  * @param string|array $taxonomies String of taxonomy name or Array of string values of taxonomy names
@@ -1261 +1261 @@
  *
  * @since 2.3.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
  *
  * @param int|object $term If integer, will get from database. If object will apply filters and return $term.
@@ -1356 +1356 @@
  *
  * @since 2.3.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
  *
  * @param string $field Either 'slug', 'name', 'id' (term_id), or 'term_taxonomy_id'
@@ -1446 +1446 @@
  *
  * @since 2.3.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $term_id ID of Term to get children
  * @param string $taxonomy Taxonomy Name
@@ -1553 +1553 @@
  *
  * @since 2.3.0
  *
- * @global wpdb $wpdb WordPress database access abstraction object.
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string|array $taxonomies Taxonomy name or list of Taxonomy names.
  * @param array|string $args {
@@ -2003 +2003 @@
  *
  * @since 3.0.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|string $term The term to check
  * @param string $taxonomy The taxonomy name to use
@@ -2143 +2143 @@
  *
  * @since 2.3.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param string $field Term field to sanitize
  * @param string $value Search for this term value
@@ -2363 +2363 @@
  *
  * @since 2.3.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $term Term ID
  * @param string $taxonomy Taxonomy Name
@@ -2562 +2562 @@
  * array of all matching term ids or term names will be returned respectively.
  *
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int|array $object_ids The ID(s) of the object(s) to retrieve.
  * @param string|array $taxonomies The taxonomies to retrieve terms from.
  * @param array|string $args Change what is returned
@@ -2733 +2734 @@
  * If the term already exists on the same hierarchical level,
  * or the term slug and name are not unique, a WP_Error object will be returned.
  *
- * @global wpdb $wpdb The WordPress database object.
+ * @global wpdb $wpdb WordPress database abstraction object.
 
  * @since 2.3.0
  *
@@ -3089 +3090 @@
  * Remove term(s) associated with a given object.
  *
  * @since 3.6.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int $object_id The ID of the object from which the terms will be removed.
  * @param array|int|string $terms The slug(s) or ID(s) of the term(s) to remove.
  * @param array|string $taxonomy Taxonomy name.
@@ -3177 +3179 @@
  * The only purpose for $term is for appending a parent, if one exists.
  *
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param string $slug The string that will be tried for a unique slug
  * @param object $term The term object that the $slug will belong too
  * @return string Will return a true unique slug.
@@ -3249 +3252 @@
  *
  * @since 2.3.0
  *
- * @uses $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $term_id The ID of the term
  * @param string $taxonomy The context in which to relate the term to the object.
@@ -3494 +3497 @@
  * of term ID. Once that is done, then update the database.
  *
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int|array $terms The term_taxonomy_id of the terms
  * @param string $taxonomy The context of the term.
  * @return bool If no terms will return false, and if successful will return true.
@@ -3607 +3611 @@
  * Will remove all of the term ids from the cache.
  *
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param int|array $ids Single or list of Term IDs
  * @param string $taxonomy Can be empty and will assume tt_ids, else will use for context.
  * @param bool $clean_taxonomy Whether to clean taxonomy wide caches (true), or just individual term object caches (false). Default is true.
@@ -3870 +3875 @@
  *
  * @access private
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param array $terms List of Term IDs
  * @param string $taxonomy Term Context
  * @return null Will break from function if conditions are not met.
@@ -3934 +3940 @@
  *
  * @access private
  * @since 2.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param array $terms List of Term taxonomy IDs
  * @param object $taxonomy Current taxonomy object of terms
  */
@@ -3982 +3989 @@
  * Default callback for the link_category taxonomy.
  *
  * @since 3.3.0
- * @uses $wpdb
  *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
  * @param array $terms List of Term taxonomy IDs
  * @param object $taxonomy Current taxonomy object of terms
  */

src/wp-includes/user.php

@@ -806 +806 @@
                  *
                  * @since 3.2.0
                  *
-                 * @global wpdb $wpdb WordPress database object.
+                 * @global wpdb $wpdb WordPress database abstraction object.
                  *
                  * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
                  */

src/wp-login.php

@@ -263 +263 @@
 /**
  * Handles sending password retrieval email to user.
  *
- * @uses $wpdb WordPress Database object
+ * @global wpdb         $wpdb      WordPress database abstraction object.
+ * @global PasswordHash $wp_hasher Portable PHP password hashing framework.
  *
  * @return bool|WP_Error True: when finish. WP_Error on error
  */