WordPress.org

Make WordPress Core

Changeset 8617


Ignore:
Timestamp:
08/11/2008 08:18:00 PM (13 years ago)
Author:
markjaquith
Message:

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

Location:
branches/2.6/wp-includes
Files:
2 edited

Legend:

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

    r8511 r8617  
    448448
    449449        if (empty($this->category_base))
    450             $this->category_base = 'category';
    451         $this->category_structure = trailingslashit( $this->front . $this->category_base );
     450            $this->category_structure = trailingslashit( $this->front . 'category' );
     451        else
     452            $this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
    452453
    453454        $this->category_structure .= '%category%';
     
    467468
    468469        if (empty($this->tag_base))
    469             $this->tag_base = 'tag';
    470         $this->tag_structure = trailingslashit( $this->front . $this->tag_base );
     470            $this->tag_structure = trailingslashit( $this->front . 'tag' );
     471        else
     472            $this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
    471473
    472474        $this->tag_structure .= '%tag%';
  • branches/2.6/wp-includes/version.php

    r8561 r8617  
    1616 * @global int $wp_db_version
    1717 */
    18 $wp_db_version = 8203;
     18$wp_db_version = 8204;
    1919
    2020?>
Note: See TracChangeset for help on using the changeset viewer.