Wordpress 2.9.2-scripts

[autoinstalls/wordpress.git] / wp-includes / shortcodes.php

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index c1c6862ba2b5b663ddf9f7912c4382c43ef76ce6..bad91c14ba56654032a917ef61eb4882685b759d 100644 (file)
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -157,6 +157,14 @@ function do_shortcode($content) {
  * The regular expression combines the shortcode tags in the regular expression
  * in a regex class.
  *
+ * 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
+ * 3 - The shortcode argument list
+ * 4 - The self closing /
+ * 5 - The content of a shortcode when it wraps some content.
+ *
  * @since 2.5
  * @uses $shortcode_tags
  *
@@ -167,11 +175,13 @@ function get_shortcode_regex() {
        $tagnames = array_keys($shortcode_tags);
        $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
 
-       return '\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?';
+       // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcodes()
+       return '(.?)\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\2\])?(.?)';
 }
 
 /**
  * Regular Expression callable for do_shortcode() for calling shortcode hook.
+ * @see get_shortcode_regex for details of the match array contents.
  *
  * @since 2.5
  * @access private
@@ -183,15 +193,20 @@ function get_shortcode_regex() {
 function do_shortcode_tag($m) {
        global $shortcode_tags;
 
-       $tag = $m[1];
-       $attr = shortcode_parse_atts($m[2]);
+       // allow [[foo]] syntax for escaping a tag
+       if ($m[1] == '[' && $m[6] == ']') {
+               return substr($m[0], 1, -1);
+       }
+
+       $tag = $m[2];
+       $attr = shortcode_parse_atts($m[3]);
 
-       if ( isset($m[4]) ) {
+       if ( isset($m[5]) ) {
                // enclosing tag - extra parameter
-               return call_user_func($shortcode_tags[$tag], $attr, $m[4], $tag);
+               return $m[1] . call_user_func($shortcode_tags[$tag], $attr, $m[5], $m[2]) . $m[6];
        } else {
                // self-closing tag
-               return call_user_func($shortcode_tags[$tag], $attr, NULL, $tag);
+               return $m[1] . call_user_func($shortcode_tags[$tag], $attr, NULL, $m[2]) . $m[6];
        }
 }
 
@@ -275,7 +290,7 @@ function strip_shortcodes( $content ) {
 
        $pattern = get_shortcode_regex();
 
-       return preg_replace('/'.$pattern.'/s', '', $content);
+       return preg_replace('/'.$pattern.'/s', '$1$6', $content);
 }
 
 add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()