Changes from trunk/wp-includes/rewrite.php at r8213 to branches/2.6/wp-includes/rewrite.php at r8617

File:

• branches/2.6/wp-includes/rewrite.php (modified) (5 diffs)

branches/2.6/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;
 }
@@ -151 +153 @@
 
             // Substitute the substring matches into the query.
-            eval("\$query = \"$query\";");
+            eval("\$query = \"" . addslashes($query) . "\";");
             // Filter out non-public query vars
             global $wp;
@@ -446 +448 @@
 
         if (empty($this->category_base))
-            $this->category_structure = $this->front . 'category/';
+            $this->category_structure = trailingslashit( $this->front . 'category' );
         else
-            $this->category_structure = $this->category_base . '/';
+            $this->category_structure = trailingslashit( '/' . $this->root . $this->category_base );
 
         $this->category_structure .= '%category%';
@@ -466 +468 @@
 
         if (empty($this->tag_base))
-            $this->tag_structure = $this->front . 'tag/';
+            $this->tag_structure = trailingslashit( $this->front . 'tag' );
         else
-            $this->tag_structure = $this->tag_base . '/';
+            $this->tag_structure = trailingslashit( '/' . $this->root . $this->tag_base );
 
         $this->tag_structure .= '%tag%';
@@ -994 +996 @@
             $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);