Ticket #18558: shortcodes.patch

wp-includes/shortcodes.php

@@ -40 +40 @@
  * @var array
  * @global array $shortcode_tags
  */
-$shortcode_tags = array();
 
+$shortcode_tags = get_option('wp_shortcodes', array());
+
+$default_shortcode = "unregistered_shortcode";
+
+function unregistered_shortcode($atts = null, $content = null) { return $content; }
+
+function register_shortcodes() {
+                global $default_shortcode;
+                global $shortcode_tags;
+                foreach($shortcode_tags as $k => $v) {
+                        $shortcode_tags[$k] = $default_shortcode;
+                }
+                update_option('wp_shortcodes', $shortcode_tags);
+}
+
+add_action( 'shutdown', 'register_shortcodes');
+
+function register_default_shortcode($func) {
+        global $default_shortcode;
+        $default_shortcode = $func;
+}
+
 /**
  * Add hook for shortcode tag.
  *
@@ -95 +116 @@
 
         if ( is_callable($func) )
                 $shortcode_tags[$tag] = $func;
+
 }
 
 /**
@@ -157 +179 @@
  * The regular expression combines the shortcode tags in the regular expression
  * in a regex class.
  *
- * The regular expression contains 6 different sub matches to help with parsing.
+ * The regular expresion contains 6 different sub matches to help with parsing.
  *
  * 1/6 - An extra [ or ] to allow for escaping shortcodes with double [[]]
  * 2 - The shortcode name