Changeset 8365

Timestamp:

07/17/2008 07:41:48 PM (16 years ago)

Author:

markjaquith

Message:

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

Location:

trunk

Files:

• wp-admin/options-permalink.php (modified) (1 diff)
• wp-includes/rewrite.php (modified) (4 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/options-permalink.php

@@ -164 +164 @@
 <h3><?php _e('Optional'); ?></h3>
 <?php if ($is_apache) : ?>
-    <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>
+    <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>
 <?php else : ?>
-    <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>
+    <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>
 <?php endif; ?>
 

trunk/wp-includes/rewrite.php

@@ -68 +68 @@
   */
 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;
 }
@@ -446 +448 @@
 
         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%';
@@ -466 +467 @@
 
         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%';
@@ -994 +994 @@
             $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);

trunk/wp-includes/version.php

@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 8201;
+$wp_db_version = 8202;
 
 ?>