Comment Page URL fixes by wnorris. fixes #8297

git-svn-id: http://svn.automattic.com/wordpress/trunk@9831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith
2008-11-21 17:33:05 +00:00
parent a7258521b1
commit c1f75d51ab
2 changed files with 9 additions and 8 deletions

View File

@@ -1230,20 +1230,20 @@ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
$base = trailingslashit( get_bloginfo( 'home' ) );
$result = $base . $request;
$result = user_trailingslashit($base . $request);
if ( 'newest' == get_option('default_comments_page') ) {
if ( $pagenum != $max_page ) {
if ( $wp_rewrite->using_permalinks() )
$result = user_trailingslashit( trailingslashit($base . $request) . 'comment-page-' . $pagenum, 'commentpaged');
$result = user_trailingslashit( trailingslashit($result) . 'comment-page-' . $pagenum, 'commentpaged');
else
$result = add_query_arg( 'cpage', $pagenum, $base . $request );
$result = add_query_arg( 'cpage', $pagenum, $result );
}
} elseif ( $pagenum > 1 ) {
if ( $wp_rewrite->using_permalinks() )
$result = user_trailingslashit( trailingslashit($base . $request) . 'comment-page-' . $pagenum, 'commentpaged');
$result = user_trailingslashit( trailingslashit($result) . 'comment-page-' . $pagenum, 'commentpaged');
else
$result = add_query_arg( 'cpage', $pagenum, $base . $request );
$result = add_query_arg( 'cpage', $pagenum, $result );
}
$result .= '#comments';