vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better solution for #4536. Slashless normalization of tag/category bases. fixes #7306 for trunk. see #4536

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@8365 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Mark Jaquith
2008-07-17 19:41:48 +00:00
parent a118de6487
commit 80f79a7fed
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/rewrite.php
View File

@@ -67,8 +67,10 @@ function add_rewrite_endpoint($name, $places) {
* @author Mark Jaquith
*/
function _wp_filter_taxonomy_base( $base ) {
if ( !empty( $base ) )
$base = preg_replace( '|^/index\.php/|', '/', $base );
if ( !empty( $base ) ) {
$base = preg_replace( '|^/index\.php/|', '', $base );
$base = trim( $base, '/' );
}
return $base;
}
@@ -445,9 +447,8 @@ class WP_Rewrite {
}
if (empty($this->category_base))
$this->category_structure = $this->front . 'category/';
else
$this->category_structure = $this->category_base . '/';
$this->category_base = 'category';
$this->category_structure = trailingslashit( $this->front . $this->category_base );
$this->category_structure .= '%category%';
@@ -465,9 +466,8 @@ class WP_Rewrite {
}
if (empty($this->tag_base))
$this->tag_structure = $this->front . 'tag/';
else
$this->tag_structure = $this->tag_base . '/';
$this->tag_base = 'tag';
$this->tag_structure = trailingslashit( $this->front . $this->tag_base );
$this->tag_structure .= '%tag%';
@@ -993,8 +993,8 @@ class WP_Rewrite {
if ($this->using_index_permalinks()) {
$this->root = $this->index . '/';
}
$this->category_base = ( ( $this->using_index_permalinks() ) ? '/' . $this->index : '' ) . get_option( 'category_base' );
$this->tag_base = ( ( $this->using_index_permalinks() ) ? '/' . $this->index : '' ) . get_option( 'tag_base' );
$this->category_base = get_option( 'category_base' );
$this->tag_base = get_option( 'tag_base' );
unset($this->category_structure);
unset($this->author_structure);
unset($this->date_structure);