Wordpress 3.7
[autoinstalls/wordpress.git] / wp-includes / canonical.php
index e4a5c5309f15ae5bf270aef0b1d9ba12ccffd988..231855ea50fe9d58b4af9d1c393096eeefed05be 100644 (file)
@@ -1,15 +1,50 @@
 <?php
 <?php
-// Based on "Permalink Redirect" from Scott Yang and "Enforce www. Preference" by Mark Jaquith
+/**
+ * Canonical API to handle WordPress Redirecting
+ *
+ * Based on "Permalink Redirect" from Scott Yang and "Enforce www. Preference"
+ * by Mark Jaquith
+ *
+ * @package WordPress
+ * @since 2.3.0
+ */
 
 
-function redirect_canonical($requested_url=NULL, $do_redirect=true) {
-       global $wp_rewrite, $posts, $is_IIS;
+/**
+ * Redirects incoming links to the proper URL based on the site url.
+ *
+ * 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 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 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
+ * or query in an attempt to figure the correct page to go to.
+ *
+ * @since 2.3.0
+ * @uses $wp_rewrite
+ * @uses $is_IIS
+ *
+ * @param string $requested_url Optional. The URL that was requested, used to
+ *             figure if redirect is needed.
+ * @param bool $do_redirect Optional. Redirect to the new 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 ) {
+       global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
 
 
-       if ( is_feed() || is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) || is_preview() )
+       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
                return;
 
        if ( !$requested_url ) {
                // build the URL in the address bar
-               $requested_url  = ( isset($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+               $requested_url  = is_ssl() ? 'https://' : 'http://';
                $requested_url .= $_SERVER['HTTP_HOST'];
                $requested_url .= $_SERVER['REQUEST_URI'];
        }
                $requested_url .= $_SERVER['HTTP_HOST'];
                $requested_url .= $_SERVER['REQUEST_URI'];
        }
@@ -19,23 +54,93 @@ function redirect_canonical($requested_url=NULL, $do_redirect=true) {
                return;
 
        // Some PHP setups turn requests for / into /index.php in REQUEST_URI
                return;
 
        // Some PHP setups turn requests for / into /index.php in REQUEST_URI
-       $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']);
+       // See: http://trac.wordpress.org/ticket/5017
+       // See: http://trac.wordpress.org/ticket/7173
+       // Disabled, for now:
+       // $original['path'] = preg_replace('|/index\.php$|', '/', $original['path']);
 
        $redirect = $original;
        $redirect_url = false;
 
 
        $redirect = $original;
        $redirect_url = false;
 
+       // Notice fixing
+       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')) ) {
+
+               $vars = $wpdb->get_results( $wpdb->prepare("SELECT post_type, post_parent FROM $wpdb->posts WHERE ID = %d", $id) );
+
+               if ( isset($vars[0]) && $vars = $vars[0] ) {
+                       if ( 'revision' == $vars->post_type && $vars->post_parent > 0 )
+                               $id = $vars->post_parent;
+
+                       if ( $redirect_url = get_permalink($id) )
+                               $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() ) {
        // 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 ( get_query_var( 'day' ) && get_query_var( 'monthnum' ) && get_query_var( 'year' ) ) {
+                       $year  = get_query_var( 'year' );
+                       $month = get_query_var( 'monthnum' );
+                       $day   = get_query_var( 'day' );
+                       $date  = sprintf( '%04d-%02d-%02d', $year, $month, $day );
+                       if ( ! wp_checkdate( $month, $day, $year, $date ) ) {
+                               $redirect_url = get_month_link( $year, $month );
+                               $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum', 'day' ), $redirect_url );
+                       }
+               } elseif ( get_query_var( 'monthnum' ) && get_query_var( 'year' ) && 12 < get_query_var( 'monthnum' ) ) {
+                       $redirect_url = get_year_link( get_query_var( 'year' ) );
+                       $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'year', 'monthnum' ), $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
        } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
                // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
-               if ( is_single() && isset($_GET['p']) ) {
+               if ( is_attachment() && !empty($_GET['attachment_id']) && ! $redirect_url ) {
+                       if ( $redirect_url = get_attachment_link(get_query_var('attachment_id')) )
+                               $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')) )
                        if ( $redirect_url = get_permalink(get_query_var('p')) )
-                               $redirect['query'] = remove_query_arg('p', $redirect['query']);
-               } elseif ( is_page() && isset($_GET['page_id']) ) {
+                               $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']);
                        if ( $redirect_url = get_permalink(get_query_var('page_id')) )
                                $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-               } elseif ( isset($_GET['m']) && ( is_year() || is_month() || is_day() ) ) {
+               } 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) ) {
                                case 4: // Yearly
                        $m = get_query_var('m');
                        switch ( strlen($m) ) {
                                case 4: // Yearly
@@ -51,151 +156,405 @@ function redirect_canonical($requested_url=NULL, $do_redirect=true) {
                        if ( $redirect_url )
                                $redirect['query'] = remove_query_arg('m', $redirect['query']);
                // now moving on to non ?m=X year/month/day links
                        if ( $redirect_url )
                                $redirect['query'] = remove_query_arg('m', $redirect['query']);
                // now moving on to non ?m=X year/month/day links
-               } elseif ( is_day() && get_query_var('year') && get_query_var('monthnum') && isset($_GET['day']) ) {
+               } elseif ( is_day() && get_query_var('year') && get_query_var('monthnum') && !empty($_GET['day']) ) {
                        if ( $redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')) )
                                $redirect['query'] = remove_query_arg(array('year', 'monthnum', 'day'), $redirect['query']);
                        if ( $redirect_url = get_day_link(get_query_var('year'), get_query_var('monthnum'), get_query_var('day')) )
                                $redirect['query'] = remove_query_arg(array('year', 'monthnum', 'day'), $redirect['query']);
-               } elseif ( is_month() && get_query_var('year') && isset($_GET['monthnum']) ) {
+               } elseif ( is_month() && get_query_var('year') && !empty($_GET['monthnum']) ) {
                        if ( $redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')) )
                                $redirect['query'] = remove_query_arg(array('year', 'monthnum'), $redirect['query']);
                        if ( $redirect_url = get_month_link(get_query_var('year'), get_query_var('monthnum')) )
                                $redirect['query'] = remove_query_arg(array('year', 'monthnum'), $redirect['query']);
-               } elseif ( is_year() && isset($_GET['year']) ) {
+               } elseif ( is_year() && !empty($_GET['year']) ) {
                        if ( $redirect_url = get_year_link(get_query_var('year')) )
                                $redirect['query'] = remove_query_arg('year', $redirect['query']);
                        if ( $redirect_url = get_year_link(get_query_var('year')) )
                                $redirect['query'] = remove_query_arg('year', $redirect['query']);
-               } elseif ( is_category() && isset($_GET['cat']) ) {
-                       if ( $redirect_url = get_category_link(get_query_var('cat')) )
-                               $redirect['query'] = remove_query_arg('cat', $redirect['query']);
-               } elseif ( is_author() && isset($_GET['author']) ) {
+               } elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
                        $author = get_userdata(get_query_var('author'));
                        $author = get_userdata(get_query_var('author'));
-                       if ( false !== $author && $redirect_url = get_author_link(false, $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());
+               }
+
+               // Post Paging
+               if ( is_singular() && ! is_front_page() && get_query_var('page') ) {
+                       if ( !$redirect_url )
+                               $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
-               if ( $paged = get_query_var('paged') ) {
-                       if ( $paged > 0 ) {
-                               if ( !$redirect_url )
-                                       $redirect_url = $requested_url;
-                               $paged_redirect = @parse_url($redirect_url);
-                               $paged_redirect['path'] = preg_replace('|/page/[0-9]+?(/+)?$|', '/', $paged_redirect['path']); // strip off any existing paging
-                               $paged_redirect['path'] = preg_replace('|/index.php/?$|', '/', $paged_redirect['path']); // strip off trailing /index.php/
-                               if ( $paged > 1 && !is_single() ) {
-                                       $paged_redirect['path'] = trailingslashit($paged_redirect['path']);
-                                       if ( $wp_rewrite->using_index_permalinks() && strpos($paged_redirect['path'], '/index.php/') === false )
-                                               $paged_redirect['path'] .= 'index.php/';
-                                       $paged_redirect['path'] .= user_trailingslashit("page/$paged", 'paged');
-                               } elseif ( !is_home() && !is_single() ){
-                                       $paged_redirect['path'] = user_trailingslashit($paged_redirect['path'], 'paged');
+               // 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
+                               $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() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
+                               $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
+                               if ( !is_singular() && get_query_var( 'withcomments' ) )
+                                       $addl_path .= 'comments/';
+                               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();
                                }
                                }
-                               $redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];
-                               $redirect['path'] = $paged_redirect['path'];
                        }
                        }
-                       $redirect['query'] = remove_query_arg('paged', $redirect['query']);
+
+                       if ( get_query_var('paged') > 0 ) {
+                               $paged = get_query_var('paged');
+                               $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("$wp_rewrite->pagination_base/$paged", 'paged');
+                                       } elseif ( !is_single() ) {
+                                               $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
+                                       }
+                               } elseif ( $paged > 1 ) {
+                                       $redirect['query'] = add_query_arg( 'paged', $paged, $redirect['query'] );
+                               }
+                       }
+
+                       if ( get_option('page_comments') && ( ( 'newest' == get_option('default_comments_page') && get_query_var('cpage') > 0 ) || ( 'newest' != get_option('default_comments_page') && get_query_var('cpage') > 1 ) ) ) {
+                               $addl_path = ( !empty( $addl_path ) ? trailingslashit($addl_path) : '' ) . user_trailingslashit( 'comment-page-' . get_query_var('cpage'), 'commentpaged' );
+                               $redirect['query'] = remove_query_arg( 'cpage', $redirect['query'] );
+                       }
+
+                       $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 ) )
+                               $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() )
+                               /** This filter is documented in wp-login.php */
+                               $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
                }
        }
 
        // tack on any additional query vars
-       if ( $redirect_url && $redirect['query'] ) {
-               if ( strpos($redirect_url, '?') !== false )
-                       $redirect_url .= '&';
-               else
-                       $redirect_url .= '?';
-               $redirect_url .= $redirect['query'];
+       $redirect['query'] = preg_replace( '#^\??&*?#', '', $redirect['query'] );
+       if ( $redirect_url && !empty($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
        }
 
        if ( $redirect_url )
                $redirect = @parse_url($redirect_url);
 
        // www.example.com vs example.com
-       $user_home = @parse_url(get_option('home'));
-       $redirect['host'] = $user_home['host'];
+       $user_home = @parse_url(home_url());
+       if ( !empty($user_home['host']) )
+               $redirect['host'] = $user_home['host'];
+       if ( empty($user_home['path']) )
+               $user_home['path'] = '/';
 
        // Handle ports
 
        // Handle ports
-       if ( isset($user_home['port']) )
+       if ( !empty($user_home['port']) )
                $redirect['port'] = $user_home['port'];
        else
                unset($redirect['port']);
 
                $redirect['port'] = $user_home['port'];
        else
                unset($redirect['port']);
 
-       // trailing /index.php/
-       $redirect['path'] = preg_replace('|/index.php/$|', '/', $redirect['path']);
+       // trailing /index.php
+       $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
+
+       // Remove trailing spaces from the path
+       $redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
+
+       if ( !empty( $redirect['query'] ) ) {
+               // Remove trailing spaces from certain terminating query string args
+               $redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
+
+               // 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() )
 
        // 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
 
        // trailing slashes
-       if ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && !is_404() && (!is_home() || ( is_home() && (get_query_var('paged') > 1) ) ) ) {
+       if ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() && !is_404() && (!is_front_page() || ( is_front_page() && (get_query_var('paged') > 1) ) ) ) {
                $user_ts_type = '';
                if ( get_query_var('paged') > 0 ) {
                        $user_ts_type = 'paged';
                } else {
                $user_ts_type = '';
                if ( get_query_var('paged') > 0 ) {
                        $user_ts_type = 'paged';
                } else {
-                       foreach ( array('single', 'category', 'page', 'day', 'month', 'year') as $type ) {
+                       foreach ( array('single', 'category', 'page', 'day', 'month', 'year', 'home') as $type ) {
                                $func = 'is_' . $type;
                                $func = 'is_' . $type;
-                               if ( call_user_func($func) )
+                               if ( call_user_func($func) ) {
                                        $user_ts_type = $type;
                                        break;
                                }
                        }
                                        $user_ts_type = $type;
                                        break;
                                }
                        }
+               }
                $redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
                $redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
-       } elseif ( is_home() ) {
+       } elseif ( is_front_page() ) {
                $redirect['path'] = trailingslashit($redirect['path']);
        }
 
                $redirect['path'] = trailingslashit($redirect['path']);
        }
 
-       // Always trailing slash the 'home' URL
-       if ( $redirect['path'] == $user_home['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']);
 
        // Ignore differences in host capitalization, as this can lead to infinite redirects
                $redirect['path'] = trailingslashit($redirect['path']);
 
        // Ignore differences in host capitalization, as this can lead to infinite redirects
-       if ( strtolower($original['host']) == strtolower($redirect['host']) )
+       // Only redirect no-www <=> yes-www
+       if ( strtolower($original['host']) == strtolower($redirect['host']) ||
+               ( strtolower($original['host']) != 'www.' . strtolower($redirect['host']) && 'www.' . strtolower($original['host']) != strtolower($redirect['host']) ) )
                $redirect['host'] = $original['host'];
 
                $redirect['host'] = $original['host'];
 
-       if ( array($original['host'], $original['port'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['port'], $redirect['path'], $redirect['query']) ) {
+       $compare_original = array($original['host'], $original['path']);
+
+       if ( !empty( $original['port'] ) )
+               $compare_original[] = $original['port'];
+
+       if ( !empty( $original['query'] ) )
+               $compare_original[] = $original['query'];
+
+       $compare_redirect = array($redirect['host'], $redirect['path']);
+
+       if ( !empty( $redirect['port'] ) )
+               $compare_redirect[] = $redirect['port'];
+
+       if ( !empty( $redirect['query'] ) )
+               $compare_redirect[] = $redirect['query'];
+
+       if ( $compare_original !== $compare_redirect ) {
                $redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
                $redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
-               if ( isset($redirect['port']) )
-                       $redirect_url .= ':' . $redirect['port'];
+               if ( !empty($redirect['port']) )
+                       $redirect_url .= ':' . $redirect['port'];
                $redirect_url .= $redirect['path'];
                $redirect_url .= $redirect['path'];
-               if ( $redirect['query'] )
+               if ( !empty($redirect['query']) )
                        $redirect_url .= '?' . $redirect['query'];
        }
 
                        $redirect_url .= '?' . $redirect['query'];
        }
 
-       if ( $redirect_url && $redirect_url != $requested_url ) {
-               // var_dump($redirect_url); die();
-               $redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
-               if ( $do_redirect) {
-                       // protect against chained redirects
-                       if ( !redirect_canonical($redirect_url, false) ) {
-                               wp_redirect($redirect_url, 301);
-                               exit();
-                       } else {
-                               return false;
+       if ( !$redirect_url || $redirect_url == $requested_url )
+               return 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);
+       }
+
+       /**
+        * Filter the canonical redirect URL.
+        *
+        * Returning false to this filter will cancel the redirect.
+        *
+        * @since 2.3.0
+        *
+        * @param string $redirect_url  The redirect URL.
+        * @param string $requested_url The requested URL.
+        */
+       $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
+               return false;
+
+       if ( $do_redirect ) {
+               // protect against chained redirects
+               if ( !redirect_canonical($redirect_url, false) ) {
+                       wp_redirect($redirect_url, 301);
+                       exit();
                } else {
                } else {
-                       return $redirect_url;
+                       // Debug
+                       // die("1: $redirect_url<br />2: " . redirect_canonical( $redirect_url, false ) );
+                       return false;
                }
        } else {
                }
        } else {
-               return false;
+               return $redirect_url;
        }
 }
 
        }
 }
 
+/**
+ * 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 The correct URL if one is found. False on failure.
+ */
 function redirect_guess_404_permalink() {
 function redirect_guess_404_permalink() {
-       global $wp_query, $wpdb;
-       if ( !get_query_var('name') )
-               return false;
+       global $wpdb, $wp_rewrite;
 
 
-       $where = "post_name LIKE '" . $wpdb->escape(get_query_var('name')) . "%'";
+       if ( get_query_var('name') ) {
+               $where = $wpdb->prepare("post_name LIKE %s", like_escape( get_query_var('name') ) . '%');
 
 
-       // if any of year, monthnum, or day are set, use them to refine the query
-       if ( get_query_var('year') )
-               $where .= " AND YEAR(post_date) = '" . $wpdb->escape(get_query_var('year')) . "'";
-       if ( get_query_var('monthnum') )
-               $where .= " AND MONTH(post_date) = '" . $wpdb->escape(get_query_var('monthnum')) . "'";
-       if ( get_query_var('day') )
-               $where .= " AND DAYOFMONTH(post_date) = '" . $wpdb->escape(get_query_var('day')) . "'";
+               // 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 ) ) ) . "')";
 
 
-       $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);
+               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;
+               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');
 
 }
 
 add_action('template_redirect', 'redirect_canonical');
 
-?>
\ No newline at end of file
+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 );