Ticket #7490: 7490_trunk.diff

wp-includes/version.php

@@ -15 +15 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 8585;
+$wp_db_version = 8586;
 
 ?>

wp-includes/rewrite.php

@@ -447 +447 @@
                 }
 
                 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%';
 
@@ -466 +467 @@
                 }
 
                 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%';