Changeset 2146

Timestamp:

01/25/2005 12:23:57 AM (20 years ago)

Author:

rboren

Message:

Generate feed and trackback rules for pages. Bug 742.

Location:

trunk

Files:

• wp-includes/classes.php (modified) (4 diffs)
• wp-trackback.php (modified) (1 diff)

trunk/wp-includes/classes.php

@@ -283 +283 @@
             $where .= " AND post_name = '" . $q['name'] . "'";
         } else if ('' != $q['pagename']) {
-            $q['pagename'] = sanitize_title($q['pagename']);
+            $q['pagename'] = sanitize_title(basename($q['pagename']));
             $q['name'] = $q['pagename'];
             $where .= " AND post_name = '" . $q['pagename'] . "'";
@@ -822 +822 @@
 
         $rewrite_rules = array();
+        $page_structure = '/%pagename%';
         if( is_array( $uris ) )
             {
                 foreach ($uris as $uri => $pagename) {
-                    $rewrite_rules += array($uri . '/?$' => "index.php?pagename=" . urldecode($pagename));
+                    $this->add_rewrite_tag('%pagename%', "($uri)", 'pagename=');
+                    $rewrite_rules += $this->generate_rewrite_rules($page_structure);
                 }
             }
@@ -930 +932 @@
 
     function add_rewrite_tag($tag, $pattern, $query) {
-        $this->rewritecode[] = $tag;
-        $this->rewritereplace[] = $pattern;
-        $this->queryreplace[] = $query;
+        // If the tag already exists, replace the existing pattern and query for
+        // that tag, otherwise add the new tag, pattern, and query to the end of
+        // the arrays.
+        $position = array_search($tag, $this->rewritecode);     
+        if (FALSE !== $position && NULL !== $position) {
+            $this->rewritereplace[$position] = $pattern;
+            $this->queryreplace[$position] = $query;            
+        } else {
+            $this->rewritecode[] = $tag;
+            $this->rewritereplace[] = $pattern;
+            $this->queryreplace[] = $query;
+        }
     }
 
@@ -1005 +1016 @@
                 $post = 0;
                 if (strstr($struct, '%postname%') || strstr($struct, '%post_id%')
+                        || strstr($struct, '%pagename%')
                         || (strstr($struct, '%year%') &&  strstr($struct, '%monthnum%') && strstr($struct, '%day%') && strstr($struct, '%hour%') && strstr($struct, '%minute') && strstr($struct, '%second%'))) {
                     $post = 1;

trunk/wp-trackback.php

@@ -49 +49 @@
 }
 
-if ( is_single() ) 
+if ( is_single() || is_page() ) 
     $tb_id = $posts[0]->ID;