Changeset 8366
- Timestamp:
- 07/17/2008 07:45:26 PM (16 years ago)
- Location:
- branches/2.6
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.6/wp-admin/options-permalink.php
r7883 r8366 164 164 <h3><?php _e('Optional'); ?></h3> 165 165 <?php if ($is_apache) : ?> 166 <p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code> /topics/</code> as your category base would make your category links like <code>http://example.org/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>166 <p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p> 167 167 <?php else : ?> 168 <p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code> /topics/</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p>168 <p><?php _e('If you like, you may enter custom structures for your category and tag <abbr title="Universal Resource Locator">URL</abbr>s here. For example, using <code>topics</code> as your category base would make your category links like <code>http://example.org/index.php/topics/uncategorized/</code>. If you leave these blank the defaults will be used.') ?></p> 169 169 <?php endif; ?> 170 170 -
branches/2.6/wp-includes/rewrite.php
r8213 r8366 68 68 */ 69 69 function _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 } 72 74 return $base; 73 75 } … … 446 448 447 449 if (empty($this->category_base)) 448 $this->category_structure = $this->front . 'category/'; 449 else 450 $this->category_structure = $this->category_base . '/'; 450 $this->category_base = 'category'; 451 $this->category_structure = trailingslashit( $this->front . $this->category_base ); 451 452 452 453 $this->category_structure .= '%category%'; … … 466 467 467 468 if (empty($this->tag_base)) 468 $this->tag_structure = $this->front . 'tag/'; 469 else 470 $this->tag_structure = $this->tag_base . '/'; 469 $this->tag_base = 'tag'; 470 $this->tag_structure = trailingslashit( $this->front . $this->tag_base ); 471 471 472 472 $this->tag_structure .= '%tag%'; … … 994 994 $this->root = $this->index . '/'; 995 995 } 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' );996 $this->category_base = get_option( 'category_base' ); 997 $this->tag_base = get_option( 'tag_base' ); 998 998 unset($this->category_structure); 999 999 unset($this->author_structure); -
branches/2.6/wp-includes/version.php
r8343 r8366 16 16 * @global int $wp_db_version 17 17 */ 18 $wp_db_version = 820 1;18 $wp_db_version = 8202; 19 19 20 20 ?>
Note: See TracChangeset
for help on using the changeset viewer.