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

Enable pretty permalinks for previous_ and next_comments_link(). props DD32, Viper007Bond. see #7942 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9318 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2008-10-24 07:36:43 +00:00
parent de26116d76
commit cf2730334f
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/canonical.php
View File

@ -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 ( get_query_var('cpage') > 1 ) {
if ( ( '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'];

22
wp-includes/link-template.php
View File

@ -1148,16 +1148,25 @@ function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
$request = preg_replace('|^'. $home_root . '|', '', $request);
$request = preg_replace('|^/+|', '', $request);
$request = preg_replace('|comment-page-[0-9]+/?$|', '', $request);
$base = trailingslashit( get_bloginfo( 'home' ) );
$result = $base . $request;
if ( 'newest' == get_option('default_comments_page') ) {
if ( $pagenum != $max_page )
if ( $pagenum != $max_page ) {
if ( $wp_rewrite->using_permalinks() )
$result = user_trailingslashit( trailingslashit($base . $request) . 'comment-page-' . $pagenum, 'commentpaged');
else
$result = add_query_arg( 'cpage', $pagenum, $base . $request );
}
} elseif ( $pagenum > 1 ) {
if ( $wp_rewrite->using_permalinks() )
$result = user_trailingslashit( trailingslashit($base . $request) . 'comment-page-' . $pagenum, 'commentpaged');
else
$result = add_query_arg( 'cpage', $pagenum, $base . $request );
} elseif ( $pagenum > 1 )
$result = add_query_arg( 'cpage', $pagenum, $base . $request );
}
$result .= '#comments';
@ -1181,7 +1190,7 @@ function next_comments_link($label='', $max_page = 0) {
return;
$page = get_query_var('cpage');
if ( !$page )
$page = 1;
@ -1209,7 +1218,6 @@ function next_comments_link($label='', $max_page = 0) {
* @param string $label Optional. Label for comments link text.
*/
function previous_comments_link($label='') {
global $wp_query;
if ( !is_singular() )
return;
@ -1222,12 +1230,12 @@ function previous_comments_link($label='') {
if ( $page <= 1 )
return;
$nextpage = intval($page) - 1;
$prevpage = intval($page) - 1;
if ( empty($label) )
$label = __('&laquo; Older Comments');
echo '<a href="' . clean_url(get_comments_pagenum_link($nextpage));
echo '<a href="' . clean_url(get_comments_pagenum_link($prevpage));
$attr = apply_filters( 'previous_comments_link_attributes', '' );
echo "\" $attr>". preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
}