Changeset 8617

Timestamp:

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

Author:

markjaquith

Message:

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

Location:

branches/2.6/wp-includes

Files:

• rewrite.php (modified) (2 diffs)
• version.php (modified) (1 diff)

branches/2.6/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%';

branches/2.6/wp-includes/version.php

@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 8203;
+$wp_db_version = 8204;
 
 ?>