sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

git-svn-id: https://develop.svn.wordpress.org/trunk@5974 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith 2007-08-29 18:10:11 +00:00
parent 0210464be1
commit 31d9b33458
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/canonical.php
View File

@ -65,7 +65,6 @@ function redirect_canonical() {
}
// paging
if ( is_paged() && strpos($redirect['query'], 'paged=') !== false ) {
if ( $paged = get_query_var('paged') ) {
if ( $paged > 1 ) {
if ( !$redirect_url )
@ -81,11 +80,15 @@ function redirect_canonical() {
$redirect['query'] = remove_query_arg('paged', $redirect['query']);
}
}
}
// tack on any additional query vars
if ( $redirect_url && $redirect['query'] )
$redirect_url .= '?' . $redirect['query'];
if ( $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