From 7ad8304223ce8cb5ed0781ab08a4336b63eac1c1 Mon Sep 17 00:00:00 2001
From: Andrew Nacin <nacin@git.wordpress.org>
Date: Thu, 8 Apr 2010 02:16:21 +0000
Subject: [PATCH] Register a dummy [media] shortcode for strip_shortcodes et
 al. props belg4mit, Viper007Bond. fixes #12505

git-svn-id: https://develop.svn.wordpress.org/trunk@14035 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/media.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/wp-includes/media.php b/wp-includes/media.php
index c6a35fa688..32faa6f9e6 100644
--- a/wp-includes/media.php
+++ b/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 );