Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Add missing doc blocks for canonical.php.

Browse Source 
See #32444.

Built from https://develop.svn.wordpress.org/trunk@32540


git-svn-id: http://core.svn.wordpress.org/trunk@32510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-05-22 04:26:26 +00:00
parent ebd3201268
commit 3d130ba909
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/canonical.php
View File

@ -27,8 +27,11 @@
* or query in an attempt to figure the correct page to go to. * or query in an attempt to figure the correct page to go to.
* *
* @since 2.3.0 * @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 * @param string $requested_url Optional. The URL that was requested, used to
* figure if redirect is needed. * 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 * @since 2.3.0
* *
* @global wpdb $wpdb WordPress database abstraction object. * @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. * @return false|string The correct URL if one is found. False on failure.
*/ */
@ -560,6 +564,10 @@ function redirect_guess_404_permalink() {
return false; return false;
} }
/**
*
* @global WP_Rewrite $wp_rewrite
*/
function wp_redirect_admin_locations() { function wp_redirect_admin_locations() {
global $wp_rewrite; global $wp_rewrite;
if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) ) if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.