WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Canonical Feed URLs, first try. see #7182 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2008-10-14 05:51:01 +00:00
parent 0e09601178
commit 828a6fd593
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-includes/canonical.php
View File

@ -39,7 +39,7 @@
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; 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() || is_robots() ) if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) || is_preview() || is_robots() )
return; return;
if ( !$requested_url ) { if ( !$requested_url ) {
@ -117,26 +117,36 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
$redirect['query'] = remove_query_arg('author', $redirect['author']); $redirect['query'] = remove_query_arg('author', $redirect['author']);
} }
// paging // paging and feeds
if ( $paged = get_query_var('paged') ) { if ( get_query_var('paged') || is_feed() ) {
if ( $paged > 0 ) {
if ( !$redirect_url ) if ( !$redirect_url )
$redirect_url = $requested_url; $redirect_url = $requested_url;
$paged_redirect = @parse_url($redirect_url); $paged_redirect = @parse_url($redirect_url);
$paged_redirect['path'] = preg_replace('|/page/[0-9]+?(/+)?$|', '/', $paged_redirect['path']); // strip off any existing paging while ( preg_match( '#page/[0-9]+?(/+)?$#', $paged_redirect['path'] ) || preg_match( '#/feed(/[a-z0-9-]*?(/+)?)?$#', $paged_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('#/feed(/[a-z0-9-]*?(/+)?)?$#', '/', $paged_redirect['path']); // strip off any existing feed
}
$paged_redirect['path'] = preg_replace('|/index.php/?$|', '/', $paged_redirect['path']); // strip off trailing /index.php/ $paged_redirect['path'] = preg_replace('|/index.php/?$|', '/', $paged_redirect['path']); // strip off trailing /index.php/
if ( get_query_var('paged') > 0 ) {
$paged = get_query_var('paged');
if ( $paged > 1 && !is_single() ) { if ( $paged > 1 && !is_single() ) {
$paged_redirect['path'] = trailingslashit($paged_redirect['path']); $paged_redirect['path'] = trailingslashit($paged_redirect['path']);
if ( $wp_rewrite->using_index_permalinks() && strpos($paged_redirect['path'], '/index.php/') === false ) if ( $wp_rewrite->using_index_permalinks() && strpos($paged_redirect['path'], '/index.php/') === false )
$paged_redirect['path'] .= 'index.php/'; $paged_redirect['path'] .= 'index.php/';
$paged_redirect['path'] .= user_trailingslashit("page/$paged", 'paged'); $paged_redirect['path'] .= user_trailingslashit("page/$paged", 'paged');
} elseif ( !is_home() && !is_single() ){ } elseif ( !is_single() ) {
$paged_redirect['path'] = user_trailingslashit($paged_redirect['path'], 'paged'); $paged_redirect['path'] = user_trailingslashit($paged_redirect['path'], 'paged');
} }
}
if ( is_feed() ) {
$paged_redirect['path'] = user_trailingslashit( trailingslashit( $paged_redirect['path'] ) . 'feed/' . ( ( 'rss2' == get_query_var('feed') || 'feed' == get_query_var('feed') ) ? '' : get_query_var('feed') ), 'feed' );
}
$redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path']; $redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];
$redirect['path'] = $paged_redirect['path']; $redirect['path'] = $paged_redirect['path'];
}
$redirect['query'] = remove_query_arg( 'paged', $redirect['query'] ); $redirect['query'] = remove_query_arg( 'paged', $redirect['query'] );
$redirect['query'] = remove_query_arg( 'feed', $redirect['query'] );
} }
} }
@ -248,6 +258,8 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
wp_redirect($redirect_url, 301); wp_redirect($redirect_url, 301);
exit(); exit();
} else { } else {
// Debug
// die("1: $redirect_url<br />2: " . redirect_canonical( $redirect_url, false ) );
return false; return false;
} }
} else { } else {