]> scripts.mit.edu Git - autoinstalls/wordpress.git/blobdiff - wp-includes/canonical.php
Wordpress 3.6
[autoinstalls/wordpress.git] / wp-includes / canonical.php
index 010e1c5e8bd063d4a927824e78051a92f6f0c5cc..423dcc6366df2efe99c09443709942e5be2c53cd 100644 (file)
@@ -5,8 +5,6 @@
  * Based on "Permalink Redirect" from Scott Yang and "Enforce www. Preference"
  * by Mark Jaquith
  *
- * @author Scott Yang
- * @author Mark Jaquith
  * @package WordPress
  * @since 2.3.0
  */
  *
  * Search engines consider www.somedomain.com and somedomain.com to be two
  * different URLs when they both go to the same location. This SEO enhancement
- * prevents penality for duplicate content by redirecting all incoming links to
+ * prevents penalty for duplicate content by redirecting all incoming links to
  * one or the other.
  *
  * Prevents redirection for feeds, trackbacks, searches, comment popup, and
- * admin URLs. Does not redirect on IIS, page/post previews, and on form data.
+ * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7+,
+ * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
+ * requests.
  *
  * Will also attempt to find the correct link when a user enters a URL that does
  * not exist based on exact WordPress query. Will instead try to parse the URL
  * @return null|false|string Null, if redirect not needed. False, if redirect
  *             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_IIS, $wp_query, $wpdb;
 
-       if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) || is_preview() || is_robots() )
+       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 ) {
                // build the URL in the address bar
-               $requested_url  = ( !empty($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+               $requested_url  = is_ssl() ? 'https://' : 'http://';
                $requested_url .= $_SERVER['HTTP_HOST'];
                $requested_url .= $_SERVER['REQUEST_URI'];
        }
@@ -63,8 +63,17 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
        $redirect_url = false;
 
        // Notice fixing
-       if ( !isset($redirect['path']) )  $redirect['path'] = '';
-       if ( !isset($redirect['query']) ) $redirect['query'] = '';
+       if ( !isset($redirect['path']) )
+               $redirect['path'] = '';
+       if ( !isset($redirect['query']) )
+               $redirect['query'] = '';
+
+       if ( is_feed() && ( $id = get_query_var( 'p' ) ) ) {
+               if ( $redirect_url = get_post_comments_feed_link( $id, get_query_var( 'feed' ) ) ) {
+                       $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed'), $redirect_url );
+                       $redirect['path'] = parse_url( $redirect_url, PHP_URL_PATH );
+               }
+       }
 
        if ( is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p')) ) {
 
@@ -75,13 +84,29 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                                $id = $vars->post_parent;
 
                        if ( $redirect_url = get_permalink($id) )
-                               $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id'), $redirect['query']);
+                               $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
                }
        }
 
        // These tests give us a WP-generated permalink
        if ( is_404() ) {
-               $redirect_url = redirect_guess_404_permalink();
+
+               // Redirect ?page_id, ?p=, ?attachment_id= to their respective url's
+               $id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id') );
+               if ( $id && $redirect_post = get_post($id) ) {
+                       $post_type_obj = get_post_type_object($redirect_post->post_type);
+                       if ( $post_type_obj->public ) {
+                               $redirect_url = get_permalink($redirect_post);
+                               $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+                       }
+               }
+
+               if ( ! $redirect_url ) {
+                       if ( $redirect_url = redirect_guess_404_permalink() ) {
+                               $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 );
+                       }
+               }
+
        } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
                // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
                if ( is_attachment() && !empty($_GET['attachment_id']) && ! $redirect_url ) {
@@ -89,17 +114,18 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                                $redirect['query'] = remove_query_arg('attachment_id', $redirect['query']);
                } elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
                        if ( $redirect_url = get_permalink(get_query_var('p')) )
-                               $redirect['query'] = remove_query_arg('p', $redirect['query']);
-                       if ( get_query_var( 'page' ) ) {
-                               $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
-                               $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
-                       }
+                               $redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
                } elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
                        if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
                                $redirect['query'] = remove_query_arg('name', $redirect['query']);
                } elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
                        if ( $redirect_url = get_permalink(get_query_var('page_id')) )
                                $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
+               } elseif ( is_page() && !is_feed() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front')  && ! $redirect_url ) {
+                       $redirect_url = home_url('/');
+               } elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts')  && ! $redirect_url ) {
+                       if ( $redirect_url = get_permalink(get_option('page_for_posts')) )
+                               $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
                } elseif ( !empty($_GET['m']) && ( is_year() || is_month() || is_day() ) ) {
                        $m = get_query_var('m');
                        switch ( strlen($m) ) {
@@ -125,34 +151,106 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                } elseif ( is_year() && !empty($_GET['year']) ) {
                        if ( $redirect_url = get_year_link(get_query_var('year')) )
                                $redirect['query'] = remove_query_arg('year', $redirect['query']);
-               } elseif ( is_category() && !empty($_GET['cat']) && preg_match( '|^[0-9]+$|', $_GET['cat'] ) ) {
-                       if ( $redirect_url = get_category_link(get_query_var('cat')) )
-                               $redirect['query'] = remove_query_arg('cat', $redirect['query']);
                } elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
                        $author = get_userdata(get_query_var('author'));
-                       if ( false !== $author && $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
-                               $redirect['query'] = remove_query_arg('author', $redirect['author']);
+                       if ( ( false !== $author ) && $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID ) ) ) {
+                               if ( $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
+                                       $redirect['query'] = remove_query_arg('author', $redirect['query']);
+                       }
+               } elseif ( is_category() || is_tag() || is_tax() ) { // Terms (Tags/categories)
+
+                       $term_count = 0;
+                       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) ) {
+                               if ( !empty($redirect['query']) ) {
+                                       // Strip taxonomy query vars off the url.
+                                       $qv_remove = array( 'term', 'taxonomy');
+                                       if ( is_category() ) {
+                                               $qv_remove[] = 'category_name';
+                                               $qv_remove[] = 'cat';
+                                       } elseif ( is_tag() ) {
+                                               $qv_remove[] = 'tag';
+                                               $qv_remove[] = 'tag_id';
+                                       } else { // Custom taxonomies will have a custom query var, remove those too:
+                                               $tax_obj = get_taxonomy( $obj->taxonomy );
+                                               if ( false !== $tax_obj->query_var )
+                                                       $qv_remove[] = $tax_obj->query_var;
+                                       }
+
+                                       $rewrite_vars = array_diff( array_keys($wp_query->query), array_keys($_GET) );
+
+                                       if ( !array_diff($rewrite_vars, array_keys($_GET))  ) { // Check to see if all the Query vars are coming from the rewrite, none are set via $_GET
+                                               $redirect['query'] = remove_query_arg($qv_remove, $redirect['query']); //Remove all of the per-tax qv's
+
+                                               // Create the destination url for this taxonomy
+                                               $tax_url = parse_url($tax_url);
+                                               if ( ! empty($tax_url['query']) ) { // Taxonomy accessible via ?taxonomy=..&term=.. or any custom qv..
+                                                       parse_str($tax_url['query'], $query_vars);
+                                                       $redirect['query'] = add_query_arg($query_vars, $redirect['query']);
+                                               } else { // Taxonomy is accessible via a "pretty-URL"
+                                                       $redirect['path'] = $tax_url['path'];
+                                               }
+
+                                       } else { // Some query vars are set via $_GET. Unset those from $_GET that exist via the rewrite
+                                               foreach ( $qv_remove as $_qv ) {
+                                                       if ( isset($rewrite_vars[$_qv]) )
+                                                               $redirect['query'] = remove_query_arg($_qv, $redirect['query']);
+                                               }
+                                       }
+                               }
+
+                       }
+               } elseif ( is_single() && strpos($wp_rewrite->permalink_structure, '%category%') !== false && $cat = get_query_var( 'category_name' ) ) {
+                       $category = get_category_by_path( $cat );
+                       $post_terms = wp_get_object_terms($wp_query->get_queried_object_id(), 'category', array('fields' => 'tt_ids'));
+                       if ( (!$category || is_wp_error($category)) || ( !is_wp_error($post_terms) && !empty($post_terms) && !in_array($category->term_taxonomy_id, $post_terms) ) )
+                               $redirect_url = get_permalink($wp_query->get_queried_object_id());
                }
 
-       // paging and feeds
-               if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
+               // Post Paging
+               if ( is_singular() && ! is_front_page() && get_query_var('page') ) {
                        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'] ) ) {
+                               $redirect_url = get_permalink( get_queried_object_id() );
+                       $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+                       $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+               }
+
+               // paging and feeds
+               if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
+                       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
                        }
 
                        $addl_path = '';
-                       if ( is_feed() ) {
+                       if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
                                $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
-                               if ( get_query_var( 'withcomments' ) )
+                               if ( !is_singular() && get_query_var( 'withcomments' ) )
                                        $addl_path .= 'comments/';
-                               $addl_path .= user_trailingslashit( 'feed/' . ( ( 'rss2' ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
+                               if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') )
+                                       $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() == 'rss2' ) ? '' : 'rss2' ), 'feed' );
+                               else
+                                       $addl_path .= user_trailingslashit( 'feed/' . ( ( get_default_feed() ==  get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
                                $redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
+                       } elseif ( is_feed() && 'old' == get_query_var('feed') ) {
+                               $old_feed_files = array(
+                                       'wp-atom.php'         => 'atom',
+                                       'wp-commentsrss2.php' => 'comments_rss2',
+                                       'wp-feed.php'         => get_default_feed(),
+                                       'wp-rdf.php'          => 'rdf',
+                                       'wp-rss.php'          => 'rss2',
+                                       'wp-rss2.php'         => 'rss2',
+                               );
+                               if ( isset( $old_feed_files[ basename( $redirect['path'] ) ] ) ) {
+                                       $redirect_url = get_feed_link( $old_feed_files[ basename( $redirect['path'] ) ] );
+                                       wp_redirect( $redirect_url, 301 );
+                                       die();
+                               }
                        }
 
                        if ( get_query_var('paged') > 0 ) {
@@ -160,9 +258,9 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                                $redirect['query'] = remove_query_arg( 'paged', $redirect['query'] );
                                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) : '' ) . user_trailingslashit($paged_redirect['path'], 'paged');
+                                               $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
                                        }
                                } elseif ( $paged > 1 ) {
                                        $redirect['query'] = add_query_arg( 'paged', $paged, $redirect['query'] );
@@ -174,31 +272,46 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                                $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
                        }
 
-                       $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('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/?$|', '/', $redirect['path']) ); // strip off trailing /index.php/
+                       if ( !empty( $addl_path ) && $wp_rewrite->using_index_permalinks() && strpos($redirect['path'], '/' . $wp_rewrite->index . '/') === false )
+                               $redirect['path'] = trailingslashit($redirect['path']) . $wp_rewrite->index . '/';
                        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'];
+               }
+
+               if ( 'wp-register.php' == basename( $redirect['path'] ) ) {
+                       if ( is_multisite() )
+                               $redirect_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
+                       else
+                               $redirect_url = site_url( 'wp-login.php?action=register' );
+                       wp_redirect( $redirect_url, 301 );
+                       die();
                }
        }
 
        // tack on any additional query vars
        $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'] );
+               }
+
+               $_parsed_query = rawurlencode_deep( $_parsed_query );
+               $redirect_url = add_query_arg( $_parsed_query, $redirect_url );
        }
 
        if ( $redirect_url )
                $redirect = @parse_url($redirect_url);
 
        // www.example.com vs example.com
-       $user_home = @parse_url(get_option('home'));
+       $user_home = @parse_url(home_url());
        if ( !empty($user_home['host']) )
                $redirect['host'] = $user_home['host'];
        if ( empty($user_home['path']) )
@@ -211,7 +324,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                unset($redirect['port']);
 
        // trailing /index.php
-       $redirect['path'] = preg_replace('|/index.php/*?$|', '/', $redirect['path']);
+       $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
 
        // Remove trailing spaces from the path
        $redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
@@ -223,13 +336,16 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                // Clean up empty query strings
                $redirect['query'] = trim(preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
 
+               // Redirect obsolete feeds
+               $redirect['query'] = preg_replace( '#(^|&)feed=rss(&|$)#', '$1feed=rss2$2', $redirect['query'] );
+
                // Remove redundant leading ampersands
                $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
        }
 
        // strip /index.php/ when we're not using PATHINFO permalinks
        if ( !$wp_rewrite->using_index_permalinks() )
-               $redirect['path'] = str_replace('/index.php/', '/', $redirect['path']);
+               $redirect['path'] = str_replace( '/' . $wp_rewrite->index . '/', '/', $redirect['path'] );
 
        // trailing slashes
        if ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && !is_404() && (!is_front_page() || ( is_front_page() && (get_query_var('paged') > 1) ) ) ) {
@@ -250,6 +366,10 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                $redirect['path'] = trailingslashit($redirect['path']);
        }
 
+       // Strip multiple slashes out of the URL
+       if ( strpos($redirect['path'], '//') > -1 )
+               $redirect['path'] = preg_replace('|/+|', '/', $redirect['path']);
+
        // Always trailing slash the Front Page URL
        if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) )
                $redirect['path'] = trailingslashit($redirect['path']);
@@ -285,10 +405,20 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
                        $redirect_url .= '?' . $redirect['query'];
        }
 
-       if ( $redirect_url == $requested_url )
+       if ( !$redirect_url || $redirect_url == $requested_url )
                return false;
 
-       // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE
+       // Hex encoded octets are case-insensitive.
+       if ( false !== strpos($requested_url, '%') ) {
+               if ( !function_exists('lowercase_octets') ) {
+                       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);
+       }
+
+       // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning false
        $redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
 
        if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request
@@ -310,36 +440,97 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
 }
 
 /**
- * Attempts to guess correct post based on query vars.
+ * Removes arguments from a query string if they are not present in a URL
+ * DO NOT use this in plugin code.
+ *
+ * @since 3.4
+ * @access private
+ *
+ * @return string The altered query string
+ */
+function _remove_qs_args_if_not_in_url( $query_string, Array $args_to_check, $url ) {
+       $parsed_url = @parse_url( $url );
+       if ( ! empty( $parsed_url['query'] ) ) {
+               parse_str( $parsed_url['query'], $parsed_query );
+               foreach ( $args_to_check as $qv ) {
+                       if ( !isset( $parsed_query[$qv] ) )
+                               $query_string = remove_query_arg( $qv, $query_string );
+               }
+       } else {
+               $query_string = remove_query_arg( $args_to_check, $query_string );
+       }
+       return $query_string;
+}
+
+/**
+ * Attempts to guess the correct URL based on query vars
  *
  * @since 2.3.0
  * @uses $wpdb
  *
- * @return bool|string Returns False, if it can't find post, returns correct
- *             location on success.
+ * @return bool|string The correct URL if one is found. False on failure.
  */
 function redirect_guess_404_permalink() {
-       global $wpdb;
+       global $wpdb, $wp_rewrite;
 
-       if ( !get_query_var('name') )
-               return false;
+       if ( get_query_var('name') ) {
+               $where = $wpdb->prepare("post_name LIKE %s", like_escape( get_query_var('name') ) . '%');
 
-       $where = $wpdb->prepare("post_name LIKE %s", get_query_var('name') . '%');
+               // if any of post_type, year, monthnum, or day are set, use them to refine the query
+               if ( get_query_var('post_type') )
+                       $where .= $wpdb->prepare(" AND post_type = %s", get_query_var('post_type'));
+               else
+                       $where .= " AND post_type IN ('" . implode( "', '", get_post_types( array( 'public' => true ) ) ) . "')";
 
-       // if any of year, monthnum, or day are set, use them to refine the query
-       if ( get_query_var('year') )
-               $where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
-       if ( get_query_var('monthnum') )
-               $where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
-       if ( get_query_var('day') )
-               $where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
+               if ( get_query_var('year') )
+                       $where .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
+               if ( get_query_var('monthnum') )
+                       $where .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
+               if ( get_query_var('day') )
+                       $where .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
 
-       $post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'");
-       if ( !$post_id )
-               return false;
-       return get_permalink($post_id);
+               $post_id = $wpdb->get_var("SELECT ID FROM $wpdb->posts WHERE $where AND post_status = 'publish'");
+               if ( ! $post_id )
+                       return false;
+               if ( get_query_var( 'feed' ) )
+                       return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
+               elseif ( get_query_var( 'page' ) )
+                       return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+               else
+                       return get_permalink( $post_id );
+       }
+
+       return false;
 }
 
 add_action('template_redirect', 'redirect_canonical');
 
-?>
+function wp_redirect_admin_locations() {
+       global $wp_rewrite;
+       if ( ! ( is_404() && $wp_rewrite->using_permalinks() ) )
+               return;
+
+       $admins = array(
+               home_url( 'wp-admin', 'relative' ),
+               home_url( 'dashboard', 'relative' ),
+               home_url( 'admin', 'relative' ),
+               site_url( 'dashboard', 'relative' ),
+               site_url( 'admin', 'relative' ),
+       );
+       if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins ) ) {
+               wp_redirect( admin_url() );
+               exit;
+       }
+
+       $logins = array(
+               home_url( 'wp-login.php', 'relative' ),
+               home_url( 'login', 'relative' ),
+               site_url( 'login', 'relative' ),
+       );
+       if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
+               wp_redirect( site_url( 'wp-login.php', 'login' ) );
+               exit;
+       }
+}
+
+add_action( 'template_redirect', 'wp_redirect_admin_locations', 1000 );