Changeset 8242 for branches/crazyhorse/wp-includes/rewrite.php

Timestamp:

07/02/2008 11:07:56 PM (17 years ago)

Author:

mdawaffe

Message:

crazyhorse: merge with log:trunk@8151:8240

File:

• branches/crazyhorse/wp-includes/rewrite.php (modified) (3 diffs)

branches/crazyhorse/wp-includes/rewrite.php

@@ -32 +32 @@
     }
     $hook = 'do_feed_' . $feedname;
-    remove_action($hook, $function, 10, 1);
+    // Remove default function hook
+    remove_action($hook, $hook, 10, 1);
     add_action($hook, $function, 10, 1);
     return $hook;
@@ -58 +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;
 }
 
@@ -981 +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);