Changeset 28223

Timestamp:

05/01/2014 03:36:27 AM (11 years ago)

Author:

nacin

Message:

Shortcode JS: Avoid errors when an escaped shortcode includes a newline between brackets.

props gcorne.
props Clorith, jorbin for tests.
see #27907, for trunk.

Location:

trunk

Files:

• src/wp-includes/js/shortcode.js (modified) (2 diffs)
• tests/qunit/wp-includes/js/shortcode.js (modified) (2 diffs)

trunk/src/wp-includes/js/shortcode.js

@@ -38 +38 @@
             // and increment the index accordingly.
             if ( match[1] ) {
-                result.match = result.match.slice( 1 );
+                result.content = result.content.slice( 1 );
                 result.index++;
             }
@@ -44 +44 @@
             // If we matched a trailing `]`, strip it from the match.
             if ( match[7] ) {
-                result.match = result.match.slice( 0, -1 );
+                result.content = result.content.slice( 0, -1 );
             }
 

trunk/tests/qunit/wp-includes/js/shortcode.js

@@ -56 +56 @@
         result = wp.shortcode.next( 'foo', 'this has the [[foo param="foo"]] shortcode' );
         equal( result, undefined, 'foo shortcode not found when escaped with params' );
+    });
+
+    test( 'next() should find shortcodes that are incorrectly escaped by newlines', function() {
+        var result;
+
+        result = wp.shortcode.next( 'foo', 'this has the [\n[foo]] shortcode' );
+        equal( result.index, 15, 'shortcode found when incorrectly escaping the start of it' );
+
+        result = wp.shortcode.next( 'foo', 'this has the [[foo]\n] shortcode' );
+        equal( result.index, 14, 'shortcode found when incorrectly escaping the end of it' );
+    });
+
+    test( 'next() should still work when there are not equal ammounts of square brackets', function() {
+        var result;
+
+        result = wp.shortcode.next( 'foo', 'this has the [[foo] shortcode' );
+        equal( result.index, 14, 'shortcode found when there are offset square brackets' );
+
+        result = wp.shortcode.next( 'foo', 'this has the [foo]] shortcode' );
+        equal( result.index, 13, 'shortcode found when there are offset square brackets' );
     });
 
@@ -124 +144 @@
     });
 
+    test( 'replace() should replace improperly escaped shortcodes that include newlines', function() {
+        var result;
+
+        result = wp.shortcode.replace( 'foo', 'this [foo] has the [[foo param="bar"]\n] shortcode ', shortcodeReplaceCallback );
+        equal( result, 'this bar has the [bar\n] shortcode ', 'escaping with newlines should not actually escape the content' );
+
+        result = wp.shortcode.replace( 'foo', 'this [foo] has the [\n[foo param="bar"]] shortcode ', shortcodeReplaceCallback );
+        equal( result, 'this bar has the [\nbar] shortcode ', 'escaping with newlines should not actually escape the content' );
+    });
+
     test( 'replace() should not replace the shortcode when it is an incomplete match', function() {
         var result;