Changeset 5150 for trunk/wp-includes/rewrite.php

Timestamp:

03/31/2007 09:19:32 AM (19 years ago)

Author:

matt

Message:

Now tag pretty permalinks should work, and support custom tag bases.

File:

• trunk/wp-includes/rewrite.php (modified) (10 diffs)

trunk/wp-includes/rewrite.php

@@ -47 +47 @@
 define('EP_SEARCH',     256 );
 define('EP_CATEGORIES', 512 );
-define('EP_AUTHORS',    1024);
-define('EP_PAGES',      2048);
+define('EP_TAGS', 1024 );
+define('EP_AUTHORS',    2048);
+define('EP_PAGES',      4096);
 //pseudo-places
 define('EP_NONE',       0  );
-define('EP_ALL',        4095);
+define('EP_ALL',        8191);
 
 //and an endpoint, like /trackback/
@@ -151 +152 @@
     var $use_trailing_slashes;
     var $category_base;
+    var $tag_base;
     var $category_structure;
+    var $tag_structure;
     var $author_base = 'author';
     var $author_structure;
@@ -182 +185 @@
                     '%post_id%',
                     '%category%',
+                    '%tag%',
                     '%author%',
                     '%pagename%',
@@ -198 +202 @@
                     '([0-9]+)',
                     '(.+?)',
+                    '(.+?)',
                     '([^/]+)',
                     '([^/]+)',
@@ -214 +219 @@
                     'p=',
                     'category_name=',
+                    'tag=',
                     'author_name=',
                     'pagename=',
@@ -377 +383 @@
 
         return $this->category_structure;
+    }
+
+    function get_tag_permastruct() {
+        if (isset($this->tag_structure)) {
+            return $this->tag_structure;
+        }
+
+        if (empty($this->permalink_structure)) {
+            $this->tag_structure = '';
+            return false;
+        }
+
+        if (empty($this->tag_base))
+            $this->tag_structure = $this->front . 'tag/';
+        else
+            $this->tag_structure = $this->tag_base . '/';
+
+        $this->tag_structure .= '%tag%';
+
+        return $this->tag_structure;
     }
 
@@ -735 +761 @@
         $category_rewrite = apply_filters('category_rewrite_rules', $category_rewrite);
 
+        // Tags
+        $tag_rewrite = $this->generate_rewrite_rules($this->get_tag_permastruct(), EP_TAGS);
+        $tag_rewrite = apply_filters('tag_rewrite_rules', $tag_rewrite);
+
         // Authors
         $author_rewrite = $this->generate_rewrite_rules($this->get_author_permastruct(), EP_AUTHORS);
@@ -744 +774 @@
 
         // Put them together.
-        $this->rules = array_merge($robots_rewrite, $default_feeds, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
+        $this->rules = array_merge($robots_rewrite, $default_feeds, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $tag_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
 
         do_action_ref_array('generate_rewrite_rules', array(&$this));
@@ -870 +900 @@
             $this->root = $this->index . '/';
         }
-        $this->category_base = get_option('category_base');
+        $this->category_base = get_option( 'category_base' );
+        $this->tag_base = get_option( 'tag_base' );
         unset($this->category_structure);
         unset($this->author_structure);
@@ -895 +926 @@
     }
 
+    function set_tag_base( $tag_base ) {
+        if ( $tag_base != $this->tag_base ) {
+            update_option( 'tag_base', $tag_base );
+            $this->init();
+        }
+    }
+
     function WP_Rewrite() {
         $this->init();