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

Timestamp:

08/11/2008 08:17:07 PM (18 years ago)

Author:

markjaquith

Message:

Do not prepend /archives/ et al to category/tag URLs unless category/tag slug is missing. fixes #7490 for trunk

File:

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

trunk/wp-includes/rewrite.php

@@ -448 +448 @@
 
                 if (empty($this->category_base))
-                        $this->category_base = 'category';
-                $this->category_structure = trailingslashit( $this->front . $this->category_base );
+                        $this->category_structure = trailingslashit( $this->front . 'category' );
+                else
+                        $this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
 
                 $this->category_structure .= '%category%';
@@ -467 +468 @@
 
                 if (empty($this->tag_base))
-                        $this->tag_base = 'tag';
-                $this->tag_structure = trailingslashit( $this->front . $this->tag_base );
+                        $this->tag_structure = trailingslashit( $this->front . 'tag' );
+                else
+                        $this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
 
                 $this->tag_structure .= '%tag%';