WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.6/wp-includes/rewrite.php

    r8213 r8617  
    6868  */
    6969function _wp_filter_taxonomy_base( $base ) {
    70     if ( !empty( $base ) )
    71         $base = preg_replace( '|^/index\.php/|', '/', $base );
     70    if ( !empty( $base ) ) {
     71        $base = preg_replace( '|^/index\.php/|', '', $base );
     72        $base = trim( $base, '/' );
     73    }
    7274    return $base;
    7375}
     
    151153
    152154            // Substitute the substring matches into the query.
    153             eval("\$query = \"$query\";");
     155            eval("\$query = \"" . addslashes($query) . "\";");
    154156            // Filter out non-public query vars
    155157            global $wp;
     
    446448
    447449        if (empty($this->category_base))
    448             $this->category_structure = $this->front . 'category/';
     450            $this->category_structure = trailingslashit( $this->front . 'category' );
    449451        else
    450             $this->category_structure = $this->category_base . '/';
     452            $this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
    451453
    452454        $this->category_structure .= '%category%';
     
    466468
    467469        if (empty($this->tag_base))
    468             $this->tag_structure = $this->front . 'tag/';
     470            $this->tag_structure = trailingslashit( $this->front . 'tag' );
    469471        else
    470             $this->tag_structure = $this->tag_base . '/';
     472            $this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
    471473
    472474        $this->tag_structure .= '%tag%';
     
    994996            $this->root = $this->index . '/';
    995997        }
    996         $this->category_base = ( ( $this->using_index_permalinks() ) ? '/' . $this->index : '' ) . get_option( 'category_base' );
    997         $this->tag_base = ( ( $this->using_index_permalinks() ) ? '/' . $this->index : '' ) . get_option( 'tag_base' );
     998        $this->category_base = get_option( 'category_base' );
     999        $this->tag_base = get_option( 'tag_base' );
    9981000        unset($this->category_structure);
    9991001        unset($this->author_structure);
Note: See TracChangeset for help on using the changeset viewer.