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

Timestamp:

08/10/2004 05:35:59 AM (21 years ago)

Author:

rboren

Message:

Static pages. Take 1.

File:

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

trunk/wp-includes/functions.php

@@ -1176 +1176 @@
 }
 
+
+function page_permastruct() {
+    $permalink_structure = get_settings('permalink_structure');
+        
+    if (empty($permalink_structure)) {
+        return '';
+    }
+
+    $front = substr($permalink_structure, 0, strpos($permalink_structure, '%'));    
+    $index = get_settings('blogfilename');
+    $prefix = '';
+    if (preg_match('#^/*' . $index . '#', $front)) {
+        $prefix = $index . '/';
+    }
+
+    return '/' . $prefix . 'site/%pagename%';    
+}
+
 function generate_rewrite_rules($permalink_structure = '', $matches = '') {
     $rewritecode = 
@@ -1188 +1206 @@
     '%post_id%',
     '%category%',
-    '%author%'
+    '%author%',
+    '%pagename%'
     );
 
@@ -1202 +1221 @@
     '([0-9]+)',
     '([/_0-9a-z-]+)',
-    '([_0-9a-z-]+)'
+    '([_0-9a-z-]+)',
+    '([_0-9a-z-]+)',
     );
 
@@ -1216 +1236 @@
     'p=',
     'category_name=',
-    'author_name='
+    'author_name=',
+    'static=1&name=',    
     );
 
@@ -1356 +1377 @@
     $author_rewrite = generate_rewrite_rules($author_structure, $matches);
 
+    // Site static pages
+    $page_structure = $prefix . 'site/%pagename%';
+    $page_rewrite = generate_rewrite_rules($page_structure, $matches);
+
     // Put them together.
-    $rewrite = $site_rewrite + $category_rewrite + $author_rewrite;
+    $rewrite = $site_rewrite + $page_rewrite + $category_rewrite + $author_rewrite;
 
     // Add on archive rewrite rules if needed.
@@ -1465 +1490 @@
         WHERE category_id = cat_ID AND post_id = ID AND post_id IN ($post_id_list)");
         
-    foreach ($dogs as $catt) {
-        $category_cache[$catt->ID][] = $catt;
+    if (!empty($dogs)) {
+        foreach ($dogs as $catt) {
+            $category_cache[$catt->ID][] = $catt;
+        }
     }