mirror of
git://develop.git.wordpress.org/
synced 2025-01-19 13:47:02 +01:00
Fix variable name collision that was breaking paging. fixes #2204
git-svn-id: https://develop.svn.wordpress.org/trunk@3396 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
2ae1176fcb
commit
dc9a9382c2
@ -1168,7 +1168,7 @@ class WP_Rewrite {
|
||||
}
|
||||
}
|
||||
|
||||
function generate_rewrite_rules($permalink_structure, $page = true, $feed = true, $forcomments = false, $walk_dirs = true) {
|
||||
function generate_rewrite_rules($permalink_structure, $paged = true, $feed = true, $forcomments = false, $walk_dirs = true) {
|
||||
$feedregex2 = '';
|
||||
foreach ($this->feeds as $feed_name) {
|
||||
$feedregex2 .= $feed_name . '|';
|
||||
@ -1236,7 +1236,7 @@ class WP_Rewrite {
|
||||
$rewrite = array();
|
||||
if ($feed)
|
||||
$rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
|
||||
if ($page)
|
||||
if ($paged)
|
||||
$rewrite = $rewrite + array($pagematch => $pagequery);
|
||||
|
||||
if ($num_toks) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user