Do not prepend /archives/ et al to category/tag URLs unless category/tag slug is missing. fixes #7490 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@8616 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
e8c5d09ab0
commit
f43cf39f19
|
@ -447,8 +447,9 @@ class WP_Rewrite {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($this->category_base))
|
if (empty($this->category_base))
|
||||||
$this->category_base = 'category';
|
$this->category_structure = trailingslashit( $this->front . 'category' );
|
||||||
$this->category_structure = trailingslashit( $this->front . $this->category_base );
|
else
|
||||||
|
$this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
|
||||||
|
|
||||||
$this->category_structure .= '%category%';
|
$this->category_structure .= '%category%';
|
||||||
|
|
||||||
|
@ -466,8 +467,9 @@ class WP_Rewrite {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($this->tag_base))
|
if (empty($this->tag_base))
|
||||||
$this->tag_base = 'tag';
|
$this->tag_structure = trailingslashit( $this->front . 'tag' );
|
||||||
$this->tag_structure = trailingslashit( $this->front . $this->tag_base );
|
else
|
||||||
|
$this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
|
||||||
|
|
||||||
$this->tag_structure .= '%tag%';
|
$this->tag_structure .= '%tag%';
|
||||||
|
|
||||||
|
|
|
@ -15,6 +15,6 @@ $wp_version = '2.7-bleeding';
|
||||||
*
|
*
|
||||||
* @global int $wp_db_version
|
* @global int $wp_db_version
|
||||||
*/
|
*/
|
||||||
$wp_db_version = 8585;
|
$wp_db_version = 8586;
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue