mirror of
https://github.com/WordPress/WordPress.git
synced 2024-10-04 18:47:41 +02:00
Fix get_pagenum_link() to work with path info permalinks and permalinks without trailing slashes. Bug 0002040.
git-svn-id: http://svn.automattic.com/wordpress/trunk@1514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
a2342f1a3f
commit
1a47e9d839
@ -331,7 +331,13 @@ function get_pagenum_link($pagenum = 1){
|
|||||||
// 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;
|
$permalink = 1;
|
||||||
$qstr = preg_replace('|(.*)/[^/]*|', '$1/', $qstr).$page_modstring.$pagenum;
|
|
||||||
|
// If it's not a path info permalink structure, trim the index.
|
||||||
|
if ( ! preg_match('#^/*' . get_settings('blogfilename') . '#', get_settings('permalink_structure'))) {
|
||||||
|
$qstr = preg_replace("#/*" . get_settings('blogfilename') . "/*#", '/', $qstr);
|
||||||
|
}
|
||||||
|
|
||||||
|
$qstr = trailingslashit($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;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user