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

Respect user trailing slash preference for multipage posts and eliminate redundant /1/. fixes #3949 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5017 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-03-10 05:54:12 +00:00
parent d115b53371
commit aa45fd5ee3
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-includes/post-template.php
View File

@ -155,10 +155,17 @@ function wp_link_pages($args = '') {
$j = str_replace('%',"$i",$pagelink);
$output .= ' ';
if ( ($i != $page) || ((!$more) && ($page==1)) ) {
if ( '' == get_option('permalink_structure') )
$output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
else
$output .= '<a href="' . trailingslashit(get_permalink()) . $i . '/">';
if ( '' == get_option('permalink_structure') ) {
if ( $i == 1 )
$output .= '<a href="' . get_permalink() . $i . '">';
else
$output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
} else {
if ( $i == 1 )
$output .= '<a href="' . get_permalink() . '">';
else
$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i) . '">';
}
}
$output .= $j;
if ( ($i != $page) || ((!$more) && ($page==1)) )