Changeset 33118

Timestamp:

07/07/2015 11:58:49 PM (9 years ago)

Author:

johnbillion

Message:

Allow shortcode parameter names (attributes) to contain dashes.

Props aaroncampbell, tyxla, izem
Fixes #9405

Location:

trunk

Files:

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

trunk/src/wp-includes/shortcodes.php

@@ -310 +310 @@
 function shortcode_parse_atts($text) {
     $atts = array();
-    $pattern = '/(\w+)\s*=\s*"([^"]*)"(?:\s|$)|(\w+)\s*=\s*\'([^\']*)\'(?:\s|$)|(\w+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
+    $pattern = '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
     $text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
     if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {

trunk/tests/phpunit/tests/shortcode.php

@@ -120 +120 @@
     }
 
+    /**
+     * @ticket 9405
+     */
+    function test_attr_hyphen() {
+        do_shortcode('[test-shortcode-tag foo="foo" foo-bar="foo-bar" foo-bar-="foo-bar-" -foo-bar="-foo-bar" -foo-bar-="-foo-bar-" foo-bar-baz="foo-bar-baz" -foo-bar-baz="-foo-bar-baz" foo--bar="foo--bar" /]');
+        $expected_attrs = array(
+            'foo' => 'foo',
+            'foo-bar' => 'foo-bar',
+            'foo-bar-' => 'foo-bar-',
+            '-foo-bar' => '-foo-bar',
+            '-foo-bar-' => '-foo-bar-',
+            'foo-bar-baz' => 'foo-bar-baz',
+            '-foo-bar-baz' => '-foo-bar-baz',
+            'foo--bar' => 'foo--bar',
+        );
+        $this->assertEquals( $expected_attrs, $this->atts );
+    }
+
     function test_two_atts() {
         do_shortcode('[test-shortcode-tag foo="asdf" bar="bing" /]');