Register a dummy [media] shortcode for strip_shortcodes et al. props belg4mit, Viper007Bond. fixes #12505

git-svn-id: http://svn.automattic.com/wordpress/trunk@14035 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/media.php

@@ -990,6 +990,9 @@ class WP_Embed {
 		// Hack to get the [embed] shortcode to run before wpautop()
 		add_filter( 'the_content', array(&$this, 'run_shortcode'), 8 );
 
+		// Shortcode placeholder for strip_shortcodes()
+		add_shortcode( 'embed', '__return_false' );
+
 		// Attempts to embed all URLs in a post
 		if ( get_option('embed_autourls') )
 			add_filter( 'the_content', array(&$this, 'autoembed'), 8 );