WP Merge to 4559

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

1 files changed, 5 insertions, 0 deletions

diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 4dd3f7d..e36f09f 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -147,6 +147,11 @@ add_filter('mce_plugins', '_mce_load_rtl_plugin');
 add_filter('mce_buttons', '_mce_add_direction_buttons');
 add_filter('tiny_mce_config_url', '_mce_config_url');
 
+// Redirect Old Slugs
+add_action('template_redirect', 'wp_old_slug_redirect');
+add_action('edit_post', 'wp_check_for_changed_slugs');
+add_action('edit_form_advanced', 'wp_remember_old_slug');
+
 // Actions
 add_action('wp_head', 'rsd_link');
 add_action('wp_head', 'locale_stylesheet');