Implement the IIS logic test that #16639 should have gotten back in the day, before it was disabled altogether. IIS canonical redirects now only supported for pretty permalink–supporting IIS7 installs. props nacin. fixes #20484. see #16639
git-svn-id: https://develop.svn.wordpress.org/trunk@21215 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
7d1a3effe2
commit
8d0e99aaba
@ -37,9 +37,9 @@
|
||||
* not needed or the string of the URL
|
||||
*/
|
||||
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 && !iis7_supports_permalinks() ) )
|
||||
return;
|
||||
|
||||
if ( !$requested_url ) {
|
||||
|
Loading…
Reference in New Issue
Block a user