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

Add back the trailing slash to paged permalinks. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@1395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rboren 2004-06-08 17:48:21 +00:00
parent 5d4fca3088
commit 336f42db94
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/template-functions-links.php
View File

@ -308,6 +308,7 @@ function get_pagenum_link($pagenum = 1){
$page_querystring = "paged"; $page_querystring = "paged";
$page_modstring = "page/"; $page_modstring = "page/";
$page_modregex = "page/?"; $page_modregex = "page/?";
$permalink = 0;
// if we already have a QUERY style page string // if we already have a QUERY style page string
if( stristr( $qstr, $page_querystring ) ) { if( stristr( $qstr, $page_querystring ) ) {
@ -315,6 +316,7 @@ function get_pagenum_link($pagenum = 1){
$qstr = preg_replace("/".$page_querystring."[^\d]+\d+/", $replacement, $qstr); $qstr = preg_replace("/".$page_querystring."[^\d]+\d+/", $replacement, $qstr);
// if we already have a mod_rewrite style page string // if we already have a mod_rewrite style page string
} elseif ( preg_match( '|'.$page_modregex.'\d+|', $qstr ) ){ } elseif ( preg_match( '|'.$page_modregex.'\d+|', $qstr ) ){
$permalink = 1;
$qstr = preg_replace('|'.$page_modregex.'\d+|',"$page_modstring$pagenum",$qstr); $qstr = preg_replace('|'.$page_modregex.'\d+|',"$page_modstring$pagenum",$qstr);
// if we don't have a page string at all ... // if we don't have a page string at all ...
@ -328,6 +330,7 @@ function get_pagenum_link($pagenum = 1){
$qstr .= $querystring_separator.$page_querystring.$querystring_equal.$pagenum; $qstr .= $querystring_separator.$page_querystring.$querystring_equal.$pagenum;
// otherwise, it could be rewritten, OR just the default index ... // otherwise, it could be rewritten, OR just the default index ...
} elseif( '' != get_settings('permalink_structure')) { } elseif( '' != get_settings('permalink_structure')) {
$permalink = 1;
$qstr = preg_replace('|(.*)/[^/]*|', '$1/', $qstr).$page_modstring.$pagenum; $qstr = preg_replace('|(.*)/[^/]*|', '$1/', $qstr).$page_modstring.$pagenum;
} else { } else {
$qstr = get_settings('blogfilename') . $querystring_start.$page_querystring.$querystring_equal.$pagenum; $qstr = get_settings('blogfilename') . $querystring_start.$page_querystring.$querystring_equal.$pagenum;
@ -340,6 +343,7 @@ function get_pagenum_link($pagenum = 1){
$home_root = trailingslashit($home_root); $home_root = trailingslashit($home_root);
$qstr = preg_replace('|^'. $home_root . '|', '', $qstr); $qstr = preg_replace('|^'. $home_root . '|', '', $qstr);
$qstr = preg_replace('|^/+|', '', $qstr); $qstr = preg_replace('|^/+|', '', $qstr);
if ($permalink) $qstr = trailingslashit($qstr);
return preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr ); return preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', trailingslashit( get_settings('home') ) . $qstr );
} }