<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29781] trunk: The joys of `wptexturize()`:</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/29781">29781</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/29781","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-09-29 04:06:54 +0000 (Mon, 29 Sep 2014)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>The joys of `wptexturize()`:

* Revert parts of <a href="https://core.trac.wordpress.org/changeset/28773">[28773]</a> and <a href="https://core.trac.wordpress.org/changeset/28727">[28727]</a> and <a href="https://core.trac.wordpress.org/changeset/29748">[29748]</a>.
* Do not crash PHP. Make the shortcode quantifier possessive to avoid backtracks.
* Reduce backtracking in long HTML comments by 100x.
* Do not ignore unclosed HTML comments.
* Do not break unregistered shortcodes, e.g. `[hello attr="value"]`.
* Do not break HTML in shortcode attributes, e.g. `[hello attr="<"]`.
* Do not match for shortcodes when there is extra whitespace, e.g. `[ hello ]`.
* Add unit tests to show <a href="https://core.trac.wordpress.org/ticket/12690">#12690</a> was not fully resolved.
* Tested PHP 5.2.4, 5.2.13, 5.4.32, and 5.5.8.

Adds/modifies unit tests.

Props miqrogroove.
See <a href="https://core.trac.wordpress.org/ticket/29557">#29557</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunktestsphpunittestsformattingWPTexturizephp">trunk/tests/phpunit/tests/formatting/WPTexturize.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php      2014-09-29 04:02:23 UTC (rev 29780)
+++ trunk/src/wp-includes/formatting.php        2014-09-29 04:06:54 UTC (rev 29781)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  * @return string The string replaced with html entities
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function wptexturize($text, $reset = false) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        global $wp_cockneyreplace, $shortcode_tags;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wp_cockneyreplace;
</ins><span class="cx" style="display: block; padding: 0 10px">         static $static_characters, $static_replacements, $dynamic_characters, $dynamic_replacements,
</span><span class="cx" style="display: block; padding: 0 10px">                $default_no_texturize_tags, $default_no_texturize_shortcodes, $run_texturize = true;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,45 +205,55 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // Look for shortcodes and HTML elements.
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $tagnames = array_keys( $shortcode_tags );
-       $tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
-       $tagregexp = "(?:$tagregexp)(?![\\w-])"; // Excerpt of get_shortcode_regex().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_regex = 
+                       '!'                             // Start of comment, after the <.
+               .       '(?:'                   // Unroll the loop: Consume everything until --> is found.
+               .               '-(?!->)'    // Dash not followed by end of comment.
+               .               '[^\-]*+'       // Consume non-dashes.
+               .       ')*+'                   // Loop possessively.
+               .       '(?:-->)?';          // End of comment. If not found, match all input.
</ins><span class="cx" style="display: block; padding: 0 10px">         
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $regex =  '/('                  // Capture the entire match.
-               .       '<'          // Find start of element.
-               .       '(?(?=!--)'     // Is this a comment?
-               .               '.+?--\s*>'  // Find end of comment
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $shortcode_regex =
+                       '\['                    // Find start of shortcode.
+               .       '[\/\[]?'               // Shortcodes may begin with [/ or [[
+               .       '[^\s\/\[\]]'   // No whitespace before name.
+               .       '[^\[\]]*+'             // Shortcodes do not contain other shortcodes. Possessive critical.
+               .       '\]'                    // Find end of shortcode.
+               .       '\]?';                  // Shortcodes may end with ]]
+       
+       $regex = 
+                       '/('                                    // Capture the entire match.
+               .               '<'                                  // Find start of element.
+               .               '(?(?=!--)'                     // Is this a comment?
+               .                       $comment_regex  // Find end of comment.
+               .               '|'
+               .                       '[^>]+>'          // Find end of element.
+               .               ')'
</ins><span class="cx" style="display: block; padding: 0 10px">                 .       '|'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                .               '[^>]+>'  // Find end of element
-               .       ')'
-               . '|'
-               .       '\['            // Find start of shortcode.
-               .       '\[?'           // Shortcodes may begin with [[
-               .       '\/?'           // Closing slash may precede name.
-               .       $tagregexp      // Only match registered shortcodes, because performance.
-               .       '[^\[\]]*'      // Shortcodes do not contain other shortcodes.
-               .       '\]'            // Find end of shortcode.
-               .       '\]?'           // Shortcodes may end with ]]
-               . ')/s';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         .               $shortcode_regex        // Find shortcodes.
+               .       ')/s';
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        $textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        foreach ( $textarr as &$curl ) {
</span><span class="cx" style="display: block; padding: 0 10px">                // Only call _wptexturize_pushpop_element if $curl is a delimiter.
</span><span class="cx" style="display: block; padding: 0 10px">                $first = $curl[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( '<' === $first && '>' === substr( $curl, -1 ) ) {
-                       // This is an HTML delimiter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( '<' === $first && '<!--' === substr( $curl, 0, 4 ) ) {
+                       // This is an HTML comment delimeter.
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        if ( '<!--' !== substr( $curl, 0, 4 ) ) {
-                               _wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
-                       }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 continue;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                } elseif ( '<' === $first && '>' === substr( $curl, -1 ) ) {
+                       // This is an HTML element delimiter.
+
+                       _wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 } elseif ( '' === trim( $curl ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // This is a newline between delimiters.  Performance improves when we check this.
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        continue;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                } elseif ( '[' === $first && 1 === preg_match( '/^\[\[?\/?' . $tagregexp . '[^\[\]]*\]\]?$/', $curl ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         } elseif ( '[' === $first && 1 === preg_match( '/^' . $shortcode_regex . '$/', $curl ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         // This is a shortcode delimiter.
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( '[[' !== substr( $curl, 0, 2 ) && ']]' !== substr( $curl, -2 ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php      2014-09-29 04:02:23 UTC (rev 29780)
+++ trunk/src/wp-includes/shortcodes.php        2014-09-29 04:06:54 UTC (rev 29781)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +231,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        // Also, see shortcode_unautop() and shortcode.js and wptexturize().
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Also, see shortcode_unautop() and shortcode.js.
</ins><span class="cx" style="display: block; padding: 0 10px">         return
</span><span class="cx" style="display: block; padding: 0 10px">                  '\\['                              // Opening bracket
</span><span class="cx" style="display: block; padding: 0 10px">                . '(\\[?)'                           // 1: Optional second opening bracket for escaping shortcodes: [[tag]]
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingWPTexturizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/WPTexturize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/WPTexturize.php      2014-09-29 04:02:23 UTC (rev 29780)
+++ trunk/tests/phpunit/tests/formatting/WPTexturize.php        2014-09-29 04:06:54 UTC (rev 29781)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1188,14 +1188,30 @@
</span><span class="cx" style="display: block; padding: 0 10px">        function data_tag_avoidance() {
</span><span class="cx" style="display: block; padding: 0 10px">                return array(
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                '[ ... ]',
+                               '[ &#8230; ]',
+                       ),
+                       array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[ is it wise to <a title="allow user content ] here? hmm"> maybe </a> ]',
</span><span class="cx" style="display: block; padding: 0 10px">                                '[ is it wise to <a title="allow user content ] here? hmm"> maybe </a> ]',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                '[is it wise to <a title="allow user content ] here? hmm"> maybe </a> ]', // HTML corruption is a known bug.  See tickets #12690 and #29557.
+                               '[is it wise to <a title="allow user content ] here? hmm&#8221;> maybe </a> ]',
+                       ),
+                       array(
+                               '[caption - is it wise to <a title="allow user content ] here? hmm"> maybe </a> ]',
+                               '[caption - is it wise to <a title="allow user content ] here? hmm&#8221;> maybe </a> ]',
+                       ),
+                       array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[ photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy </a> ]',
</span><span class="cx" style="display: block; padding: 0 10px">                                '[ photos by <a href="http://example.com/?a[]=1&#038;a[]=2"> this guy </a> ]',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                '[photos by <a href="http://example.com/?a[]=1&a[]=2"> this guy </a>]',
+                               '[photos by <a href="http://example.com/?a[]=1&#038;a[]=2"> this guy </a>]',
+                       ),
+                       array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[gallery ...]',
</span><span class="cx" style="display: block; padding: 0 10px">                                '[gallery ...]',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1212,10 +1228,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                '[/gallery ...]',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[...]...[/...]', // These are potentially usable shortcodes.
-                               '[&#8230;]&#8230;[/&#8230;]',
-                       ),
-                       array(
</del><span class="cx" style="display: block; padding: 0 10px">                                 '[[gallery]]...[[/gallery]]', // Shortcode parsing will ignore the inner ]...[ part and treat this as a single escaped shortcode.
</span><span class="cx" style="display: block; padding: 0 10px">                                '[[gallery]]&#8230;[[/gallery]]',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1224,10 +1236,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                '[[[gallery]]]&#8230;[[[/gallery]]]',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[gal>ery ...]',
-                               '[gal>ery &#8230;]',
-                       ),
-                       array(
</del><span class="cx" style="display: block; padding: 0 10px">                                 '[gallery ...',
</span><span class="cx" style="display: block; padding: 0 10px">                                '[gallery &#8230;',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1300,10 +1308,42 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                '<!--...-->',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '<!-- ... -- >',
-                               '<!-- ... -- >',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '<!-- ... -- > ...',
+                               '<!-- ... -- > ...',
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                '<!-- ...', // An unclosed comment is still a comment.
+                               '<!-- ...',
+                       ),
+                       array(
+                               'a<!-->b', // Browsers seem to allow this.
+                               'a<!-->b',
+                       ),
+                       array(
+                               'a<!--->b',
+                               'a<!--->b',
+                       ),
+                       array(
+                               'a<!---->b',
+                               'a<!---->b',
+                       ),
+                       array(
+                               'a<!----->b',
+                               'a<!----->b',
+                       ),
+                       array(
+                               'a<!-- c --->b',
+                               'a<!-- c --->b',
+                       ),
+                       array(
+                               'a<!-- c -- d -->b',
+                               'a<!-- c -- d -->b',
+                       ),
+                       array(
+                               'a<!-- <!-- c --> -->b<!-- close -->',
+                               'a<!-- <!-- c --> &#8211;>b<!-- close -->',
+                       ),
+                       array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                 '<!-- <br /> [gallery] ... -->',
</span><span class="cx" style="display: block; padding: 0 10px">                                '<!-- <br /> [gallery] ... -->',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1727,13 +1767,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                '[code ...]...[/code]', // code is not a registered shortcode.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[code &#8230;]&#8230;[/code]',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[code ...]...[/code]',
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><span class="cx" style="display: block; padding: 0 10px">                                '[hello ...]...[/hello]', // hello is not a registered shortcode.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                '[hello &#8230;]&#8230;[/hello]',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         '[hello ...]&#8230;[/hello]',
</ins><span class="cx" style="display: block; padding: 0 10px">                         ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                '[...]...[/...]', // These are potentially usable shortcodes.
+                               '[...]&#8230;[/...]',
+                       ),
+                       array(
+                               '[gal>ery ...]',
+                               '[gal>ery ...]',
+                       ),
+                       array(
+                               '[randomthing param="test"]',
+                               '[randomthing param="test"]',
+                       ),
+                       array(
</ins><span class="cx" style="display: block; padding: 0 10px">                                 '[[audio]...[/audio]...', // These are potentially usable shortcodes.  Unfortunately, the meaning of [[audio] is ambiguous unless we run the entire shortcode regexp.
</span><span class="cx" style="display: block; padding: 0 10px">                                '[[audio]&#8230;[/audio]&#8230;',
</span><span class="cx" style="display: block; padding: 0 10px">                        ),
</span></span></pre>
</div>
</div>

</body>
</html>