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

Timestamp:

10/17/2010 05:41:22 AM (14 years ago)

Author:

dd32

Message:

Merge Category/Tag URL creation/rewriting into general Taxonomy system. Removes the legacy handling for these url's. See #12659

File:

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

trunk/wp-includes/rewrite.php

@@ -380 +380 @@
      */
     var $use_trailing_slashes;
-
-    /**
-     * Customized or default category permalink base ( example.com/xx/tagname ).
-     *
-     * @since 1.5.0
-     * @access private
-     * @var string
-     */
-    var $category_base;
-
-    /**
-     * Customized or default tag permalink base ( example.com/xx/tagname ).
-     *
-     * @since 2.3.0
-     * @access private
-     * @var string
-     */
-    var $tag_base;
-
-    /**
-     * Permalink request structure for categories.
-     *
-     * @since 1.5.0
-     * @access private
-     * @var string
-     */
-    var $category_structure;
-
-    /**
-     * Permalink request structure for tags.
-     *
-     * @since 2.3.0
-     * @access private
-     * @var string
-     */
-    var $tag_structure;
 
     /**
@@ -682 +646 @@
                     '([^/]+)',
                     '([0-9]+)',
-                    '(.+?)',
-                    '(.+?)',
                     '([^/]+)',
                     '([^/]+?)',
@@ -706 +668 @@
                     'name=',
                     'p=',
-                    'category_name=',
-                    'tag=',
                     'author_name=',
                     'pagename=',
@@ -1029 +989 @@
      */
     function get_category_permastruct() {
-        if ( isset($this->category_structure) )
-            return $this->category_structure;
-
-        if ( empty($this->permalink_structure) ) {
-            $this->category_structure = '';
-            return false;
-        }
-
-        if ( empty($this->category_base) )
-            $this->category_structure = trailingslashit( $this->front . 'category' );
-        else
-            $this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
-
-        $this->category_structure .= '%category%';
-
-        return $this->category_structure;
+        return $this->get_extra_permastruct('category');
     }
 
@@ -1061 +1006 @@
      */
     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 = trailingslashit( $this->front . 'tag' );
-        else
-            $this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
-
-        $this->tag_structure .= '%tag%';
-
-        return $this->tag_structure;
+        return $this->get_extra_permastruct('post_tag');
     }
 
@@ -1614 +1544 @@
         $search_rewrite = apply_filters('search_rewrite_rules', $search_rewrite);
 
-        // Categories
-        $category_rewrite = $this->generate_rewrite_rules($this->get_category_permastruct(), EP_CATEGORIES);
-        $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);
@@ -1631 +1553 @@
 
         // Extra permastructs
-        foreach ( $this->extra_permastructs as $permastruct ) {
+        foreach ( $this->extra_permastructs as $permastructname => $permastruct ) {
             if ( is_array($permastruct) )
-                $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct[0], $permastruct[1]));
+                $rules = $this->generate_rewrite_rules($permastruct[0], $permastruct[1]);
             else
-                $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct, EP_NONE));
+                $rules = $this->generate_rewrite_rules($permastruct, EP_NONE);
+
+            $rules = apply_filters($permastructname . '_rewrite_rules', $rules);
+            if ( 'post_tag' == $permastructname )
+                $rules = apply_filters('tag_rewrite_rules', $rules);
+
+            $this->extra_rules_top = array_merge($this->extra_rules_top, $rules);
         }
 
         // Put them together.
         if ( $this->use_verbose_page_rules )
-            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $tag_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
+            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $this->extra_rules);
         else
-            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $tag_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
+            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $registration_pages, $root_rewrite, $comments_rewrite, $search_rewrite,  $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
 
         do_action_ref_array('generate_rewrite_rules', array(&$this));
@@ -1979 +1907 @@
         if ( $this->using_index_permalinks() )
             $this->root = $this->index . '/';
-        $this->category_base = get_option( 'category_base' );
-        $this->tag_base = get_option( 'tag_base' );
-        unset($this->category_structure);
         unset($this->author_structure);
         unset($this->date_structure);
@@ -2033 +1958 @@
      */
     function set_category_base($category_base) {
-        if ( $category_base != $this->category_base ) {
+        if ( $category_base != get_option('category_base') ) {
             update_option('category_base', $category_base);
             $this->init();
@@ -2052 +1977 @@
      */
     function set_tag_base( $tag_base ) {
-        if ( $tag_base != $this->tag_base ) {
+        if ( $tag_base != get_option( 'tag_base') ) {
             update_option( 'tag_base', $tag_base );
             $this->init();