Changes from branches/3.0/wp-includes/canonical.php at r15708 to trunk/wp-includes/canonical.php at r17031

File:

• trunk/wp-includes/canonical.php (modified) (9 diffs)

trunk/wp-includes/canonical.php

@@ -35 +35 @@
  *      not needed or the string of the URL
  */
-function redirect_canonical($requested_url=null, $do_redirect=true) {
-    global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
-
-    if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) || is_preview() || is_robots() )
+function redirect_canonical( $requested_url = null, $do_redirect = true ) {
+    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_iis7 && !iis7_supports_permalinks() ) )
         return;
 
@@ -147 +147 @@
 
             $term_count = 0;
-            foreach ( array('category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in',
-            'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and') as $key )
-                $term_count += count($wp_query->query_vars[$key]);
+            foreach ( $wp_query->tax_query->queries as $tax_query )
+                $term_count += count( $tax_query['terms'] );
 
             $obj = $wp_query->get_queried_object();
-
-            if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) )
-                    && !is_wp_error($tax_url) && $redirect['query'] ) {
-                if ( is_category() ) {
-                    $redirect['query'] = remove_query_arg( array( 'category_name', 'category', 'cat'), $redirect['query']);
-                } elseif ( is_tag() ) {
-                    $redirect['query'] = remove_query_arg( array( 'tag', 'tag_id'), $redirect['query']);
-                } elseif ( is_tax() ) { // Custom taxonomies will have a custom query var, remove those too:
-                    $tax = get_taxonomy( $obj->taxonomy );
-                    if ( false !== $tax->query_var)
-                        $redirect['query'] = remove_query_arg($tax->query_var, $redirect['query']);
-                    else
-                        $redirect['query'] = remove_query_arg( array( 'term', 'taxonomy'), $redirect['query']);
+            if ( $term_count <= 1 && !empty($obj->term_id) && ( $tax_url = get_term_link((int)$obj->term_id, $obj->taxonomy) ) && !is_wp_error($tax_url) ) {
+                if ( !empty($redirect['query']) ) {
+                    if ( is_category() ) {
+                        $redirect['query'] = remove_query_arg( array( 'category_name', 'category', 'cat'), $redirect['query']);
+                    } elseif ( is_tag() ) {
+                        $redirect['query'] = remove_query_arg( array( 'tag', 'tag_id'), $redirect['query']);
+                    } elseif ( is_tax() ) { // Custom taxonomies will have a custom query var, remove those too:
+                        $tax = get_taxonomy( $obj->taxonomy );
+                        if ( false !== $tax->query_var)
+                            $redirect['query'] = remove_query_arg($tax->query_var, $redirect['query']);
+                        else
+                            $redirect['query'] = remove_query_arg( array( 'term', 'taxonomy'), $redirect['query']);
+                    }
                 }
-
                 $tax_url = parse_url($tax_url);
                 if ( ! empty($tax_url['query']) ) { // Custom taxonomies may only be accessable via ?taxonomy=..&term=..
@@ -174 +172 @@
                     $redirect['path'] = $tax_url['path'];
                 }
-
             }
         } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false ) {
@@ -191 +188 @@
         // paging and feeds
         if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
-            if ( !$redirect_url )
-                $redirect_url = $requested_url;
-            $paged_redirect = @parse_url($redirect_url);
-            while ( preg_match( '#/page/?[0-9]+?(/+)?$#', $paged_redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $paged_redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $paged_redirect['path'] ) ) {
+            while ( preg_match( "#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", $redirect['path'] ) || preg_match( '#/(comments/?)?(feed|rss|rdf|atom|rss2)(/+)?$#', $redirect['path'] ) || preg_match( '#/comment-page-[0-9]+(/+)?$#', $redirect['path'] ) ) {
                 // Strip off paging and feed
-                $paged_redirect['path'] = preg_replace('#/page/?[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing paging
-                $paged_redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $paged_redirect['path']); // strip off feed endings
-                $paged_redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $paged_redirect['path']); // strip off any existing comment paging
+                $redirect['path'] = preg_replace("#/$wp_rewrite->pagination_base/?[0-9]+?(/+)?$#", '/', $redirect['path']); // strip off any existing paging
+                $redirect['path'] = preg_replace('#/(comments/?)?(feed|rss2?|rdf|atom)(/+|$)#', '/', $redirect['path']); // strip off feed endings
+                $redirect['path'] = preg_replace('#/comment-page-[0-9]+?(/+)?$#', '/', $redirect['path']); // strip off any existing comment paging
             }
 
@@ -215 +209 @@
                 if ( !is_feed() ) {
                     if ( $paged > 1 && !is_single() ) {
-                        $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit("page/$paged", 'paged');
+                        $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit("$wp_rewrite->pagination_base/$paged", 'paged');
                     } elseif ( !is_single() ) {
                         $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
@@ -229 +223 @@
             }
 
-            $paged_redirect['path'] = user_trailingslashit( preg_replace('|/index.php/?$|', '/', $paged_redirect['path']) ); // strip off trailing /index.php/
-            if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($paged_redirect['path'], '/index.php/') === false )
-                $paged_redirect['path'] = trailingslashit($paged_redirect['path']) . 'index.php/';
+            $redirect['path'] = user_trailingslashit( preg_replace('|/index.php/?$|', '/', $redirect['path']) ); // strip off trailing /index.php/
+            if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/index.php/') === false )
+                $redirect['path'] = trailingslashit($redirect['path']) . 'index.php/';
             if ( !empty( $addl_path ) )
-                $paged_redirect['path'] = trailingslashit($paged_redirect['path']) . $addl_path;
-            $redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];
-            $redirect['path'] = $paged_redirect['path'];
+                $redirect['path'] = trailingslashit($redirect['path']) . $addl_path;
+            $redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
         }
     }
@@ -242 +235 @@
     $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
     if ( $redirect_url && !empty($redirect['query']) ) {
-        if ( strpos($redirect_url, '?') !== false )
-            $redirect_url .= '&';
-        else
-            $redirect_url .= '?';
-        $redirect_url .= $redirect['query'];
+        parse_str( $redirect['query'], $_parsed_query );
+        $redirect = @parse_url($redirect_url);
+
+        if ( ! empty( $_parsed_query['name'] ) && ! empty( $redirect['query'] ) ) {
+            parse_str( $redirect['query'], $_parsed_redirect_query );
+
+            if ( empty( $_parsed_redirect_query['name'] ) )
+                unset( $_parsed_query['name'] );
+        }
+
+        $redirect_url = add_query_arg( $_parsed_query, $redirect_url );
     }
 
@@ -346 +345 @@
     if ( !$redirect_url || $redirect_url == $requested_url )
         return false;
-        
-    // Hex encoded octets are case-insensitive. 
+
+    // Hex encoded octets are case-insensitive.
     if ( false !== strpos($requested_url, '%') ) {
         if ( !function_exists('lowercase_octets') ) {
-            function lowercase_octets($matches) { 
-                return strtolower( $matches[0] ); 
-            } 
+            function lowercase_octets($matches) {
+                return strtolower( $matches[0] );
+            }
         }
         $requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url);
@@ -393 +392 @@
         return false;
 
-    $where = $wpdb->prepare("post_name LIKE %s", get_query_var('name') . '%');
+    $where = $wpdb->prepare("post_name LIKE %s", like_escape( get_query_var('name') ) . '%');
 
     // if any of post_type, year, monthnum, or day are set, use them to refine the query