Changeset 1381 for trunk/wp-includes/functions.php

Timestamp:

06/02/2004 05:16:44 AM (21 years ago)

Author:

rboren

Message:

Rewrite rule fixes.

File:

• trunk/wp-includes/functions.php (modified) (7 diffs)

trunk/wp-includes/functions.php

@@ -1175 +1175 @@
 }
 
-function generate_rewrite_rules($permalink_structure = '') {
+function generate_rewrite_rules($permalink_structure = '', $matches = '') {
     $rewritecode = 
     array(
@@ -1200 +1200 @@
     '([_0-9a-z-]+)',
     '([0-9]+)',
-    '(.*)',
+    '([/_0-9a-z-]+)',
     '([_0-9a-z-]+)'
     );
@@ -1268 +1268 @@
                 $query = $index . '?' . $query . '&page=' . preg_index($num_toks + 1, $matches);
         } else {
-            $match .= '?';
+            $match .= '?$';
             $query = $index . '?' . $query;
         }
@@ -1299 +1299 @@
     }
 
-    $post_rewrite = generate_rewrite_rules($permalink_structure);
+    $post_rewrite = generate_rewrite_rules($permalink_structure, $matches);
+
+    $feedregex = '(feed|rdf|rss|rss2|atom)/?$';
+    $pageregex = 'page/?([0-9]{1,})/?$';
+    $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));    
 
     // If the permalink does not have year, month, and day, we need to create a
@@ -1307 +1311 @@
         $doarchive = true;
         $archive_structure = $front . '%year%/%monthnum%/%day%/';
-        $archive_rewrite =  generate_rewrite_rules($archive_structure);
-    }
-
-    $feedregex = '(feed|rdf|rss|rss2|atom)/?$';
-    $pageregex = 'page/?([0-9]{1,})/?$';
-    $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));    
+        $archive_rewrite =  generate_rewrite_rules($archive_structure, $matches);
+    }
 
     // Site feed
@@ -1339 +1339 @@
 
     $category_structure = $category_structure . '%category%';
-    $category_rewrite = generate_rewrite_rules($category_structure);
+    $category_rewrite = generate_rewrite_rules($category_structure, $matches);
 
     // Authors
     $author_structure = $front . 'author/%author%';
-    $author_rewrite = generate_rewrite_rules($author_structure);
+    $author_rewrite = generate_rewrite_rules($author_structure, $matches);
 
     // Put them together.
-    $rewrite = $site_rewrite + $category_rewrite + $author_rewrite + $post_rewrite;
+    $rewrite = $site_rewrite + $category_rewrite + $author_rewrite;
 
     // Add on archive rewrite rules if needed.
@@ -1352 +1352 @@
         $rewrite = $rewrite + $archive_rewrite;
     }
+
+    $rewrite = $rewrite + $post_rewrite;
 
     return $rewrite;