Changeset 8213

Timestamp:

06/29/2008 08:20:25 AM (17 years ago)

Author:

markjaquith

Message:

Silently add /index.php/ to category_base and tag_base for blogs using PATHINFO permalinks. fixes #4536

Location:

trunk/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• rewrite.php (modified) (2 diffs)

trunk/wp-includes/default-filters.php ¶

@@ -154 +154 @@
 add_filter('pre_comment_content', 'wp_rel_nofollow', 15);
 add_filter('comment_email', 'antispambot');
+add_filter('option_tag_base', '_wp_filter_taxonomy_base');
+add_filter('option_category_base', '_wp_filter_taxonomy_base');
 
 //Atom SSL support

trunk/wp-includes/rewrite.php ¶

@@ -59 +59 @@
     global $wp_rewrite;
     $wp_rewrite->add_endpoint($name, $places);
+}
+
+/**
+  * _wp_filter_taxonomy_base() - filter the URL base for taxonomies, to remove any manually prepended /index.php/
+  * @param string $base the taxonomy base that we're going to filter
+  * @return string
+  * @author Mark Jaquith 
+  */
+function _wp_filter_taxonomy_base( $base ) {
+    if ( !empty( $base ) )
+        $base = preg_replace( '|^/index\.php/|', '/', $base );
+    return $base;
 }
 
@@ -982 +994 @@
             $this->root = $this->index . '/';
         }
-        $this->category_base = get_option( 'category_base' );
-        $this->tag_base = get_option( 'tag_base' );
+        $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' );
         unset($this->category_structure);
         unset($this->author_structure);