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

Reënable canonical redirects for IIS. Let's work out any remaining bugs in this cycle. fixes #20484. reverts [17492]. see #16639 

git-svn-id: http://core.svn.wordpress.org/trunk@21207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2012-07-05 13:23:39 +00:00
parent de9d8299d8
commit 7b66f555a4
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/canonical.php
View File

@ -18,7 +18,9 @@
* one or the other. * one or the other.
* *
* Prevents redirection for feeds, trackbacks, searches, comment popup, and * Prevents redirection for feeds, trackbacks, searches, comment popup, and
* admin URLs. Does not redirect on IIS, page/post previews, and on form data. * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7,
* page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
* requests.
* *
* Will also attempt to find the correct link when a user enters a URL that does * Will also attempt to find the correct link when a user enters a URL that does
* not exist based on exact WordPress query. Will instead try to parse the URL * not exist based on exact WordPress query. Will instead try to parse the URL
@ -26,7 +28,7 @@
* *
* @since 2.3.0 * @since 2.3.0
* @uses $wp_rewrite * @uses $wp_rewrite
* @uses $is_IIS * @uses $is_iis7
* *
* @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.
@ -35,9 +37,9 @@
* not needed or the string of the URL * not needed or the string of the URL
*/ */
function redirect_canonical( $requested_url = null, $do_redirect = true ) { function redirect_canonical( $requested_url = null, $do_redirect = true ) {
global $wp_rewrite, $is_IIS, $wp_query, $wpdb; global $wp_rewrite, $is_iis7, $wp_query, $wpdb;
if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || $is_IIS ) if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_iis7 && !iis7_supports_permalinks() ) )
return; return;
if ( !$requested_url ) { if ( !$requested_url ) {