Do not perform canonical redirects for IISto avoid redirect loops on some IIS setups. fixes #16639 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@17492 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
9c2707c3e7
commit
c292114f91
|
@ -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 ) {
|
||||||
|
|
Loading…
Reference in New Issue