From 9a5b1ac1085c7c735206eb63b7313251a9a60ed5 Mon Sep 17 00:00:00 2001 From: Mark Jaquith Date: Fri, 24 Oct 2008 10:53:09 +0000 Subject: [PATCH] Redirect away from paged comments permalinks when comment paging has been turned off. props DD32. see #7942 git-svn-id: https://develop.svn.wordpress.org/trunk@9322 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/canonical.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index a9b4af11da..16bda4a63f 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -149,7 +149,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) { 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' ); } - if ( ( 'newest' == get_option('default_comments_page') && get_query_var('cpage') > 0 ) || ( 'newest' != get_option('default_comments_page') && get_query_var('cpage') > 1 ) ) { + if ( get_option('page_comments') && ( ( 'newest' == get_option('default_comments_page') && get_query_var('cpage') > 0 ) || ( 'newest' != get_option('default_comments_page') && get_query_var('cpage') > 1 ) ) ) { $paged_redirect['path'] = user_trailingslashit( trailingslashit( $paged_redirect['path'] ) . 'comment-page-' . get_query_var('cpage'), 'commentpaged' ); } $redirect_url = $paged_redirect['scheme'] . '://' . $paged_redirect['host'] . $paged_redirect['path'];