diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 046c4ee463..9759178fb8 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -27,8 +27,11 @@ * or query in an attempt to figure the correct page to go to. * * @since 2.3.0 - * @uses $wp_rewrite - * @uses $is_IIS + * + * @global WP_Rewrite $wp_rewrite + * @global bool $is_IIS + * @global WP_Query $wp_query + * @global wpdb $wpdb * * @param string $requested_url Optional. The URL that was requested, used to * figure if redirect is needed. @@ -524,6 +527,7 @@ 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. */ @@ -560,6 +564,10 @@ function redirect_guess_404_permalink() { return false; } +/** + * + * @global WP_Rewrite $wp_rewrite + */ function wp_redirect_admin_locations() { global $wp_rewrite; if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) ) diff --git a/wp-includes/version.php b/wp-includes/version.php index fa11220e39..2e0132fa3d 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32539'; +$wp_version = '4.3-alpha-32540'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.