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

Fix variable name collision that was breaking paging. fixes #2204 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3396 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-01-04 00:41:53 +00:00
parent e2aecdde88
commit 6db55e81a6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/classes.php
View File

@ -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 = ''; $feedregex2 = '';
foreach ($this->feeds as $feed_name) { foreach ($this->feeds as $feed_name) {
$feedregex2 .= $feed_name . '|'; $feedregex2 .= $feed_name . '|';
@ -1236,7 +1236,7 @@ class WP_Rewrite {
$rewrite = array(); $rewrite = array();
if ($feed) if ($feed)
$rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2); $rewrite = array($feedmatch => $feedquery, $feedmatch2 => $feedquery2);
if ($page) if ($paged)
$rewrite = $rewrite + array($pagematch => $pagequery); $rewrite = $rewrite + array($pagematch => $pagequery);
if ($num_toks) { if ($num_toks) {