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

git-svn-id: https://develop.svn.wordpress.org/trunk@8616 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith 2008-08-11 20:17:07 +00:00
parent b9a1481317
commit 5a8b37fdc9
2 changed files with 7 additions and 5 deletions

View File

@ -447,8 +447,9 @@ class WP_Rewrite {
}
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,8 +467,9 @@ class WP_Rewrite {
}
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%';

View File

@ -15,6 +15,6 @@ $wp_version = '2.7-bleeding';
*
* @global int $wp_db_version
*/
$wp_db_version = 8585;
$wp_db_version = 8586;
?>