WP Merge to rev 8216

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1344 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 0 deletions

diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index bba6608..011a1ed 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -153,6 +153,8 @@ add_action('check_comment_flood', 'check_comment_flood_db', 10, 3);
 add_filter('comment_flood_filter', 'wp_throttle_comment_flood', 10, 3);
 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
 add_filter('atom_service_url','atom_service_url_filter');