Changes from branches/3.1/wp-includes/canonical.php at r17549 to trunk/wp-includes/canonical.php at r17031
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/canonical.php
r17549 r17031 36 36 */ 37 37 function redirect_canonical( $requested_url = null, $do_redirect = true ) { 38 global $wp_rewrite, $is_ IIS, $wp_query, $wpdb;39 40 if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || $is_IIS)38 global $wp_rewrite, $is_iis7, $wp_query, $wpdb; 39 40 if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || !empty($_POST) || is_preview() || is_robots() || ( $is_iis7 && !iis7_supports_permalinks() ) ) 41 41 return; 42 42 … … 151 151 152 152 $obj = $wp_query->get_queried_object(); 153 if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) && !empty($redirect['query'])) {153 if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) { 154 154 if ( !empty($redirect['query']) ) { 155 155 if ( is_category() ) { … … 196 196 197 197 $addl_path = ''; 198 if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds )) {198 if ( is_feed() ) { 199 199 $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : ''; 200 200 if ( get_query_var( 'withcomments' ) )
Note: See TracChangeset
for help on using the changeset viewer.