WP Merge to rev 5109

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@934 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 35cd104..cda3cc9 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -145,6 +145,8 @@ add_filter('the_author', 'ent2ncr', 8);
 // Misc filters
 add_filter('option_ping_sites', 'privacy_ping_filter');
 add_filter('option_blog_charset', 'wp_specialchars');
+add_filter('option_home', '_config_wp_home');
+add_filter('option_siteurl', '_config_wp_siteurl');
 add_filter('mce_plugins', '_mce_load_rtl_plugin');
 add_filter('mce_buttons', '_mce_add_direction_buttons');