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

Timestamp:

03/26/2008 06:37:19 AM (17 years ago)

Author:

ryan

Message:

Taxonomy links and template tags from andy. see #6357

File:

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

trunk/wp-includes/rewrite.php

@@ -462 +462 @@
     }
 
+    function get_extra_permastruct($name) {
+        if ( isset($this->extra_permastructs[$name]) )
+            return $this->extra_permastructs[$name];
+        return false;
+    }
+
     function get_author_permastruct() {
         if (isset($this->author_structure)) {
@@ -833 +839 @@
 
         // Extra permastructs
-        $extra_rewrite = array();
         foreach ( $this->extra_permastructs as $permastruct )
-            $extra_rewrite = array_merge($extra_rewrite, $this->generate_rewrite_rules($permastruct, EP_NONE));
+            $this->extra_rules_top = array_merge($this->extra_rules_top, $this->generate_rewrite_rules($permastruct, EP_NONE));
 
         // Put them together.
         if ( $this->use_verbose_page_rules )
-            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $page_rewrite, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $tag_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $extra_rewrite, $this->extra_rules);
+            $this->rules = array_merge($this->extra_rules_top, $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);
         else
-            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $tag_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $extra_rewrite, $page_rewrite, $this->extra_rules);
+            $this->rules = array_merge($this->extra_rules_top, $robots_rewrite, $default_feeds, $root_rewrite, $comments_rewrite, $search_rewrite, $category_rewrite, $tag_rewrite, $author_rewrite, $date_rewrite, $post_rewrite, $page_rewrite, $this->extra_rules);
 
         do_action_ref_array('generate_rewrite_rules', array(&$this));
@@ -955 +960 @@
     }
 
-    function add_permastruct($struct, $with_front = true) {
+    function add_permastruct($name, $struct, $with_front = true) {
         if ( $with_front )
             $struct = $this->front . $struct;
-        $this->extra_permastructs[] = $struct;
+        $this->extra_permastructs[$name] = $struct;
     }