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

Properly handle paged permalink URLs even when we are not already 301ing. fixes #20385 

git-svn-id: http://svn.automattic.com/wordpress/trunk@20397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2012-04-07 05:18:50 +00:00
parent a2b1c52214
commit 5ccce3d681
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/canonical.php
View File

@ -209,7 +209,9 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
}
// Post Paging
if ( is_singular() && get_query_var('page') && $redirect_url ) {
if ( is_singular() && 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'] );
}