diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-01-05 09:31:17 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-01-05 09:31:17 +0000 |
| commit | b57ac48281c44847de6f128c109c5d13bd46d1cc (patch) | |
| tree | e30de50e289a9ae890d45ab4f34513ff39532d8b /wp-inst/wp-includes/classes.php | |
| parent | 6236ff5e9118e0d334e0a55713f5f434ca8e332d (diff) | |
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@492 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/classes.php')
| -rw-r--r-- | wp-inst/wp-includes/classes.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-inst/wp-includes/classes.php b/wp-inst/wp-includes/classes.php index 54218d8..5628797 100644 --- a/wp-inst/wp-includes/classes.php +++ b/wp-inst/wp-includes/classes.php @@ -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) { @@ -1398,7 +1398,7 @@ class WP_Rewrite { } else { $rules .= "RewriteCond %{REQUEST_FILENAME} !-f\n" . "RewriteCond %{REQUEST_FILENAME} !-d\n" . - "RewriteRule . {$home_root}{$this->index}\n"; + "RewriteRule . {$home_root}{$this->index} [L]\n"; } $rules .= "</IfModule>\n"; |