← Back to branch summary

~katiekitty/+junk/wordpress-byet

« back to all changes in this revision

Viewing changes to wp-includes/canonical.php

  • Committer: kserver
  • Date: 2010-05-15 01:16:36 UTC
  • Revision ID: kserver@kserver-desktop-20100515011636-mnr1j7t637suptdq
Wordpress 2.9.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/canonical.php
84
84
                $redirect_url = redirect_guess_404_permalink();
85
85
        } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
86
86
                // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
87
 
                if ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
 
87
                if ( is_attachment() && !empty($_GET['attachment_id']) && ! $redirect_url ) {
 
88
                        if ( $redirect_url = get_attachment_link(get_query_var('attachment_id')) )
 
89
                                $redirect['query'] = remove_query_arg('attachment_id', $redirect['query']);
 
90
                } elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
88
91
                        if ( $redirect_url = get_permalink(get_query_var('p')) )
89
92
                                $redirect['query'] = remove_query_arg('p', $redirect['query']);
90
93
                        if ( get_query_var( 'page' ) ) {
91
94
                                $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
92
95
                                $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
93
96
                        }
 
97
                } elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
 
98
                        if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
 
99
                                $redirect['query'] = remove_query_arg('name', $redirect['query']);
94
100
                } elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
95
101
                        if ( $redirect_url = get_permalink(get_query_var('page_id')) )
96
102
                                $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
122
128
                } elseif ( is_category() && !empty($_GET['cat']) && preg_match( '|^[0-9]+$|', $_GET['cat'] ) ) {
123
129
                        if ( $redirect_url = get_category_link(get_query_var('cat')) )
124
130
                                $redirect['query'] = remove_query_arg('cat', $redirect['query']);
125
 
                } elseif ( is_author() && !empty($_GET['author']) ) {
 
131
                } elseif ( is_author() && !empty($_GET['author']) && preg_match( '|^[0-9]+$|', $_GET['author'] ) ) {
126
132
                        $author = get_userdata(get_query_var('author'));
127
133
                        if ( false !== $author && $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
128
134
                                $redirect['query'] = remove_query_arg('author', $redirect['author']);