Changeset 41326 for trunk/src/wp-includes/taxonomy.php

Timestamp:

08/31/2017 12:25:14 PM (7 years ago)

Author:

ocean90

Message:

Taxonomy: Remove unused global imports for $wpdb in get_terms() and wp_get_object_terms().

Also remove incorrect @global tags for $wpdb and $wp_filter.

Fixes #41768.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (7 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -727 +727 @@
  *              The `$taxonomy` parameter was made optional.
  *
- * @global wpdb $wpdb WordPress database abstraction object.
  * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
  *
@@ -837 +836 @@
  *              a WP_Term object if `$output` is `OBJECT`.
  *
- * @global wpdb $wpdb WordPress database abstraction object.
  * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
  *
@@ -1047 +1045 @@
  * @internal The `$deprecated` parameter is parsed for backward compatibility only.
  *
- * @global wpdb  $wpdb WordPress database abstraction object.
- * @global array $wp_filter
- *
  * @param string|array $args       Optional. Array or string of arguments. See WP_Term_Query::__construct()
  *                                 for information on accepted arguments. Default empty.
@@ -1059 +1054 @@
  */
 function get_terms( $args = array(), $deprecated = '' ) {
-    global $wpdb;
-
     $term_query = new WP_Term_Query();
 
@@ -1855 +1848 @@
  * @since 4.7.0 Refactored to use WP_Term_Query, and to support any WP_Term_Query arguments.
  *
- * @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.
@@ -1864 +1855 @@
  */
 function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
-    global $wpdb;
-
     if ( empty( $object_ids ) || empty( $taxonomies ) )
         return array();
@@ -3887 +3876 @@
  * @param int $term_id Term ID.
  * @return bool Returns false if a term is not shared between multiple taxonomies or
- *              if splittng shared taxonomy terms is finished. 
+ *              if splittng shared taxonomy terms is finished.
  */
 function wp_term_is_shared( $term_id ) {