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

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.
Built from https://develop.svn.wordpress.org/trunk@41326


git-svn-id: http://core.svn.wordpress.org/trunk@41157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2017-08-31 12:26:42 +00:00
parent 320c289ec0
commit fff02086dd
2 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/taxonomy.php
View File

@ -726,7 +726,6 @@ function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) {
* @since 4.4.0 Converted to return a WP_Term object if `$output` is `OBJECT`. * @since 4.4.0 Converted to return a WP_Term object if `$output` is `OBJECT`.
* The `$taxonomy` parameter was made optional. * 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. * @see sanitize_term_field() The $context param lists the available values for get_term_by() $filter param.
* *
* @param int|WP_Term|object $term If integer, term data will be fetched from the database, or from the cache if * @param int|WP_Term|object $term If integer, term data will be fetched from the database, or from the cache if
@ -836,7 +835,6 @@ function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
* @since 4.4.0 `$taxonomy` is optional if `$field` is 'term_taxonomy_id'. Converted to return * @since 4.4.0 `$taxonomy` is optional if `$field` is 'term_taxonomy_id'. Converted to return
* a WP_Term object if `$output` is `OBJECT`. * 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. * @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' * @param string $field Either 'slug', 'name', 'id' (term_id), or 'term_taxonomy_id'
@ -1046,9 +1044,6 @@ function get_term_to_edit( $id, $taxonomy ) {
* *
* @internal The `$deprecated` parameter is parsed for backward compatibility only. * @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() * @param string|array $args Optional. Array or string of arguments. See WP_Term_Query::__construct()
* for information on accepted arguments. Default empty. * for information on accepted arguments. Default empty.
* @param array $deprecated Argument array, when using the legacy function parameter format. If present, this * @param array $deprecated Argument array, when using the legacy function parameter format. If present, this
@ -1058,8 +1053,6 @@ function get_term_to_edit( $id, $taxonomy ) {
* do not exist. * do not exist.
*/ */
function get_terms( $args = array(), $deprecated = '' ) { function get_terms( $args = array(), $deprecated = '' ) {
global $wpdb;
$term_query = new WP_Term_Query(); $term_query = new WP_Term_Query();
$defaults = array( $defaults = array(
@ -1854,8 +1847,6 @@ function wp_delete_category( $cat_ID ) {
* 'all_with_object_id', an array of `WP_Term` objects will be returned. * 'all_with_object_id', an array of `WP_Term` objects will be returned.
* @since 4.7.0 Refactored to use WP_Term_Query, and to support any WP_Term_Query arguments. * @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 int|array $object_ids The ID(s) of the object(s) to retrieve.
* @param string|array $taxonomies The taxonomies to retrieve terms from. * @param string|array $taxonomies The taxonomies to retrieve terms from.
* @param array|string $args See WP_Term_Query::__construct() for supported arguments. * @param array|string $args See WP_Term_Query::__construct() for supported arguments.
@ -1863,8 +1854,6 @@ function wp_delete_category( $cat_ID ) {
* WP_Error if any of the $taxonomies don't exist. * WP_Error if any of the $taxonomies don't exist.
*/ */
function wp_get_object_terms($object_ids, $taxonomies, $args = array()) { function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
global $wpdb;
if ( empty( $object_ids ) || empty( $taxonomies ) ) if ( empty( $object_ids ) || empty( $taxonomies ) )
return array(); return array();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-alpha-41325'; $wp_version = '4.9-alpha-41326';
/** /**
* 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.