Remove some unused globals and/or their docs.

staylor · staylor · commit d416922cbfa3 · 2015-09-22T20:26:17.000Z
See ##33491. git-svn-id: https://develop.svn.wordpress.org/trunk@34446 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
@@ -77,8 +77,6 @@ public function prepare_items() {
 	}
 
 	/**
-	 *
-	 * @global wpdb  $wpdb
 	 * @global array $post_mime_types
 	 * @global array $avail_post_mime_types
 	 * @return array
diff --git a/src/wp-includes/canonical.php b/src/wp-includes/canonical.php
@@ -533,12 +533,11 @@ function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $ur
  * @since 2.3.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
- * @global WP_Rewrite $wp_rewrite
  *
  * @return false|string The correct URL if one is found. False on failure.
  */
 function redirect_guess_404_permalink() {
-	global $wpdb, $wp_rewrite;
+	global $wpdb;
 
 	if ( get_query_var('name') ) {
 		$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');
diff --git a/src/wp-includes/comment-functions.php b/src/wp-includes/comment-functions.php
@@ -162,7 +162,6 @@ function get_approved_comments( $post_id, $args = array() ) {
  *
  * @since 2.0.0
  *
- * @global wpdb   $wpdb WordPress database abstraction object.
  * @global object $comment
  *
  * @param WP_Comment|string|int $comment Comment to retrieve.
diff --git a/src/wp-includes/post-functions.php b/src/wp-includes/post-functions.php
@@ -5406,12 +5406,11 @@ function update_post_cache( &$posts ) {
  * @since 2.0.0
  *
  * @global bool $_wp_suspend_cache_invalidation
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int|WP_Post $post Post ID or post object to remove from the cache.
  */
 function clean_post_cache( $post ) {
-	global $_wp_suspend_cache_invalidation, $wpdb;
+	global $_wp_suspend_cache_invalidation;
 
 	if ( ! empty( $_wp_suspend_cache_invalidation ) )
 		return;
diff --git a/src/wp-includes/post-template.php b/src/wp-includes/post-template.php
@@ -528,13 +528,12 @@ function body_class( $class = '' ) {
  * @since 2.8.0
  *
  * @global WP_Query $wp_query
- * @global wpdb     $wpdb
  *
  * @param string|array $class One or more classes to add to the class list.
  * @return array Array of classes.
  */
 function get_body_class( $class = '' ) {
-	global $wp_query, $wpdb;
+	global $wp_query;
 
 	$classes = array();
 
diff --git a/src/wp-includes/taxonomy-functions.php b/src/wp-includes/taxonomy-functions.php
@@ -3869,8 +3869,6 @@ function _wp_check_split_terms_in_menus( $term_id, $new_term_id, $term_taxonomy_
  * @ignore
  * @since 4.3.0
  *
- * @global wpdb $wpdb
- *
  * @param int    $term_id          ID of the formerly shared term.
  * @param int    $new_term_id      ID of the new term created for the $term_taxonomy_id.
  * @param int    $term_taxonomy_id ID for the term_taxonomy row affected by the split.
diff --git a/src/wp-includes/user-functions.php b/src/wp-includes/user-functions.php
@@ -859,7 +859,6 @@ function setup_userdata($for_user_id = '') {
  *
  * @since 2.3.0
  *
- * @global wpdb $wpdb WordPress database object for queries.
  * @global int  $blog_id
  *
  * @param array|string $args {

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,6 @@ public function prepare_items() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`/**`
`80`		`- *`
`81`		`- * @global wpdb $wpdb`
`82`	`80`	`* @global array $post_mime_types`
`83`	`81`	`* @global array $avail_post_mime_types`
`84`	`82`	`* @return array`
Original file line number	Diff line number	Diff line change
`@@ -533,12 +533,11 @@ function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $ur`
`533`	`533`	`* @since 2.3.0`
`534`	`534`	`*`
`535`	`535`	`* @global wpdb $wpdb WordPress database abstraction object.`
`536`		`- * @global WP_Rewrite $wp_rewrite`
`537`	`536`	`*`
`538`	`537`	`* @return false\|string The correct URL if one is found. False on failure.`
`539`	`538`	`*/`
`540`	`539`	`function redirect_guess_404_permalink() {`
`541`		`- global $wpdb, $wp_rewrite;`
	`540`	`+ global $wpdb;`
`542`	`541`
`543`	`542`	`if ( get_query_var('name') ) {`
`544`	`543`	`$where = $wpdb->prepare("post_name LIKE %s", $wpdb->esc_like( get_query_var('name') ) . '%');`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,6 @@ function get_approved_comments( $post_id, $args = array() ) {`
`162`	`162`	`*`
`163`	`163`	`* @since 2.0.0`
`164`	`164`	`*`
`165`		`- * @global wpdb $wpdb WordPress database abstraction object.`
`166`	`165`	`* @global object $comment`
`167`	`166`	`*`
`168`	`167`	`* @param WP_Comment\|string\|int $comment Comment to retrieve.`
Original file line number	Diff line number	Diff line change
`@@ -5406,12 +5406,11 @@ function update_post_cache( &$posts ) {`
`5406`	`5406`	`* @since 2.0.0`
`5407`	`5407`	`*`
`5408`	`5408`	`* @global bool $_wp_suspend_cache_invalidation`
`5409`		`- * @global wpdb $wpdb WordPress database abstraction object.`
`5410`	`5409`	`*`
`5411`	`5410`	`* @param int\|WP_Post $post Post ID or post object to remove from the cache.`
`5412`	`5411`	`*/`
`5413`	`5412`	`function clean_post_cache( $post ) {`
`5414`		`- global $_wp_suspend_cache_invalidation, $wpdb;`
	`5413`	`+ global $_wp_suspend_cache_invalidation;`
`5415`	`5414`
`5416`	`5415`	`if ( ! empty( $_wp_suspend_cache_invalidation ) )`
`5417`	`5416`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -528,13 +528,12 @@ function body_class( $class = '' ) {`
`528`	`528`	`* @since 2.8.0`
`529`	`529`	`*`
`530`	`530`	`* @global WP_Query $wp_query`
`531`		`- * @global wpdb $wpdb`
`532`	`531`	`*`
`533`	`532`	`* @param string\|array $class One or more classes to add to the class list.`
`534`	`533`	`* @return array Array of classes.`
`535`	`534`	`*/`
`536`	`535`	`function get_body_class( $class = '' ) {`
`537`		`- global $wp_query, $wpdb;`
	`536`	`+ global $wp_query;`
`538`	`537`
`539`	`538`	`$classes = array();`
`540`	`539`
Original file line number	Diff line number	Diff line change
`@@ -3869,8 +3869,6 @@ function _wp_check_split_terms_in_menus( $term_id, $new_term_id, $term_taxonomy_`
`3869`	`3869`	`* @ignore`
`3870`	`3870`	`* @since 4.3.0`
`3871`	`3871`	`*`
`3872`		`- * @global wpdb $wpdb`
`3873`		`- *`
`3874`	`3872`	`* @param int $term_id ID of the formerly shared term.`
`3875`	`3873`	`* @param int $new_term_id ID of the new term created for the $term_taxonomy_id.`
`3876`	`3874`	`* @param int $term_taxonomy_id ID for the term_taxonomy row affected by the split.`
Original file line number	Diff line number	Diff line change
`@@ -859,7 +859,6 @@ function setup_userdata($for_user_id = '') {`
`859`	`859`	`*`
`860`	`860`	`* @since 2.3.0`
`861`	`861`	`*`
`862`		`- * @global wpdb $wpdb WordPress database object for queries.`
`863`	`862`	`* @global int $blog_id`
`864`	`863`	`*`
`865`	`864`	`* @param array\|string $args {`