Changes from branches/3.4/wp-includes/canonical.php at r21115 to trunk/wp-includes/canonical.php at r20688

File:

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

trunk/wp-includes/canonical.php

@@ -101 +101 @@
 
                 if ( ! $redirect_url ) {
-                        if ( $redirect_url = redirect_guess_404_permalink() ) {
+                        if ( $redirect_url = redirect_guess_404_permalink( $requested_url ) ) {
                                 $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
                         }
@@ -462 +462 @@
 
 /**
- * Attempts to guess the correct URL based on query vars
+ * Attempts to guess the correct URL from the current URL (that produced a 404) or
+ * the current query variables.
  *
  * @since 2.3.0
  * @uses $wpdb
  *
+ * @param string $current_url Optional. The URL that has 404'd.
  * @return bool|string The correct URL if one is found. False on failure.
  */
-function redirect_guess_404_permalink() {
+function redirect_guess_404_permalink( $current_url = '' ) {
         global $wpdb, $wp_rewrite;
+
+        if ( ! empty( $current_url ) )
+                $parsed_url = @parse_url( $current_url );
+
+        // Attempt to redirect bare category slugs if the permalink structure starts
+        // with the %category% tag.
+        if ( isset( $parsed_url['path'] )
+                && preg_match( '#^[^%]+%category%#', $wp_rewrite->permalink_structure )
+                && $cat = get_category_by_path( $parsed_url['path'] )
+        ) {
+                if ( ! is_wp_error( $cat ) )
+                        return get_term_link( $cat );
+        }
 
         if ( get_query_var('name') ) {