Changeset 41026

Timestamp:

07/11/2017 12:53:33 AM (8 years ago)

Author:

SergeyBiryukov

Message:

Shortcodes: Allow using single quotes for empty value attributes.

Props enrico.sorcinelli.
Fixes #37304.

Location:

trunk

Files:

• src/wp-includes/js/shortcode.js (modified) (2 diffs)
• src/wp-includes/shortcodes.php (modified) (2 diffs)
• tests/phpunit/tests/shortcode.php (modified) (1 diff)
• tests/qunit/wp-includes/js/shortcode.js (modified) (1 diff)

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

@@ -135 +135 @@
             // 6. an unquoted value.
             // 7. A numeric attribute in double quotes.
-            // 8. An unquoted numeric attribute.
-            pattern = /([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*'([^']*)'(?:\s|$)|([\w-]+)\s*=\s*([^\s'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/g;
+            // 8. A numeric attribute in single quotes.
+            // 9. An unquoted numeric attribute.
+            pattern = /([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*'([^']*)'(?:\s|$)|([\w-]+)\s*=\s*([^\s'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|'([^']*)'(?:\s|$)|(\S+)(?:\s|$)/g;
 
             // Map zero-width spaces to actual spaces.
@@ -153 +154 @@
                 } else if ( match[8] ) {
                     numeric.push( match[8] );
+                } else if ( match[9] ) {
+                    numeric.push( match[9] );
                 }
             }

trunk/src/wp-includes/shortcodes.php

@@ -488 +488 @@
  */
 function get_shortcode_atts_regex() {
-    return '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
+    return '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|\'([^\']*)\'(?:\s|$)|(\S+)(?:\s|$)/';
 }
 
@@ -520 +520 @@
             elseif (isset($m[7]) && strlen($m[7]))
                 $atts[] = stripcslashes($m[7]);
-            elseif (isset($m[8]))
+            elseif (isset($m[8]) && strlen($m[8]))
                 $atts[] = stripcslashes($m[8]);
+            elseif (isset($m[9]))
+                $atts[] = stripcslashes($m[9]);
         }
 

trunk/tests/phpunit/tests/shortcode.php

@@ -841 +841 @@
         return wp_json_encode( $arr );
     }
+
+    /**
+     * @ticket 37304
+     *
+     * Test 'value' syntax for empty attributes
+     */
+    function test_empty_single_quote_attribute() {
+        $out = do_shortcode( '[test-shortcode-tag a="foo" b=\'bar\' c=baz foo \'bar\' "baz" ]test empty atts[/test-shortcode-tag]' );
+        $this->assertEquals( array( 'a' => 'foo', 'b' => 'bar', 'c' => 'baz', 0 => 'foo', 1 => 'bar', 2 => 'baz' ), $this->atts );
+    }
+
+    /**
+     * @ticket 37304
+     */
+    function test_positional_atts_single_quotes() {
+        $out = do_shortcode( "[test-shortcode-tag 'something in quotes' 'something else']" );
+        $this->assertEquals( '', $out );
+        $this->assertEquals( array( 0 => 'something in quotes', 1 => 'something else' ), $this->atts );
+        $this->assertEquals( 'test-shortcode-tag', $this->tagname );
+    }
+
+    /**
+     * @ticket 37304
+     */
+    function test_positional_atts_mixed_quotes() {
+        $out = do_shortcode( "[test-shortcode-tag 'something in quotes' \"something else\" 123 foo bar='baz' example=\"test\" ]" );
+        $this->assertEquals( '', $out );
+        $this->assertEquals( array( 0 => 'something in quotes', 1 => 'something else', 2 => '123', 3 => 'foo', 'bar' => 'baz', 'example' => 'test'), $this->atts );
+        $this->assertEquals( 'test-shortcode-tag', $this->tagname );
+    }
 }

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

@@ -197 +197 @@
         deepEqual( wp.shortcode.attrs('foo not="a blocker" bar baz'), expected, 'attr parsed numeric attributes');
     });
+
+    test( 'attrs() should return numeric attributes created with single, double, and no quotes', function() {
+        var expected = {
+            'named': {}, 'numeric' : ['foo', 'bar', 'baz']
+        };
+
+        deepEqual( wp.shortcode.attrs('foo "bar" \'baz\''), expected, 'attr parsed numeric attributes');
+    });
+    
+    test( 'attrs() should return mixed attributes created with single, double, and no quotes', function() {
+        var expected = {
+            'named': { a: 'foo', b: 'bar', c: 'baz' }, 'numeric' : ['foo', 'bar', 'baz']
+        };
+
+        deepEqual( wp.shortcode.attrs('a="foo" b=\'bar\' c=baz foo "bar" \'baz\''), expected, 'attr parsed numeric attributes');
+    });
 });