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

Revert [9193]. See #6627. Will revisit for 2.8 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2008-11-12 21:55:25 +00:00
parent c4cffaad13
commit c323670331
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/canonical.php
View File

@ -87,8 +87,6 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
if ( is_single() && !empty($_GET['p']) && ! $redirect_url ) { if ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
if ( $redirect_url = get_permalink(get_query_var('p')) ) if ( $redirect_url = get_permalink(get_query_var('p')) )
$redirect['query'] = remove_query_arg('p', $redirect['query']); $redirect['query'] = remove_query_arg('p', $redirect['query']);
} elseif ( is_single() && ! $redirect_url ) {
$redirect_url = get_permalink( url_to_postid( $requested_url ) );
if ( get_query_var( 'page' ) ) { if ( get_query_var( 'page' ) ) {
$redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' ); $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
$redirect['query'] = remove_query_arg( 'page', $redirect['query'] ); $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );