golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
markjaquith 2008-08-11 20:17:07 +00:00
parent e8c5d09ab0
commit f43cf39f19
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/rewrite.php
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%';

2
wp-includes/version.php
View File

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