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

Fix paging and preview links for canonical stuff. see #4773. fixes #4862 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-08-29 18:10:11 +00:00
parent ef5caabe37
commit 9e48d38752
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wp-includes/canonical.php
View File

@ -64,28 +64,31 @@ function redirect_canonical() {
$redirect['query'] = remove_query_arg('author', $redirect['author']); $redirect['query'] = remove_query_arg('author', $redirect['author']);
} }
// paging // paging
if ( is_paged() && strpos($redirect['query'], 'paged=') !== false ) { if ( $paged = get_query_var('paged') ) {
if ( $paged = get_query_var('paged') ) { if ( $paged > 1 ) {
if ( $paged > 1 ) { 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('|/index.php/?$|', '/', $paged_redirect['path']);
$paged_redirect['path'] = preg_replace('|/index.php/?$|', '/', $paged_redirect['path']); $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_redirect['path'] .= user_trailingslashit("page/$paged"); $redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];
$redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];
}
$redirect['query'] = remove_query_arg('paged', $redirect['query']);
} }
$redirect['query'] = remove_query_arg('paged', $redirect['query']);
} }
} }
// tack on any additional query vars // tack on any additional query vars
if ( $redirect_url && $redirect['query'] ) if ( $redirect_url && $redirect['query'] ) {
$redirect_url .= '?' . $redirect['query']; if ( strpos($redirect_url, '?') !== false )
$redirect_url .= '&';
else
$redirect_url .= '?';
$redirect_url .= $redirect['query'];
}
if ( !$redirect_url ) { // we're only going down this road if we don't have a WP-generated link from above if ( !$redirect_url ) { // we're only going down this road if we don't have a WP-generated link from above