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

Do not perform canonical redirects for IISto avoid redirect loops on some IIS setups. fixes #16639 for 3.1 

git-svn-id: http://svn.automattic.com/wordpress/branches/3.1@17493 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-03-02 15:33:42 +00:00
parent bb2e880429
commit fdf0a096db
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/canonical.php
View File

@ -35,9 +35,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_iis7, $wp_query, $wpdb; global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_iis7 && !iis7_supports_permalinks() ) ) if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || $is_IIS )
return; return;
if ( !$requested_url ) { if ( !$requested_url ) {