Changeset 22382

Timestamp:

11/05/2012 10:27:36 PM (12 years ago)

Author:

ryan

Message:

Allow hyphens in shortcode names.

Props kovshenin, solarissmoke, aaroncampbell
fixes #17657

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (1 diff)
• shortcodes.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -296 +296 @@
         .     '\\['                          // Opening bracket
         .     "($tagregexp)"                 // 2: Shortcode name
-        .     '\\b'                          // Word boundary
+        .     '(?![\\w-])'                   // Word boundary
                                              // Unroll the loop: Inside the opening shortcode tag
         .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash

trunk/wp-includes/shortcodes.php

@@ -183 +183 @@
         . '(\\[?)'                           // 1: Optional second opening bracket for escaping shortcodes: [[tag]]
         . "($tagregexp)"                     // 2: Shortcode name
-        . '\\b'                              // Word boundary
+        . '(?![\\w-])'                       // Word boundary
         . '('                                // 3: Unroll the loop: Inside the opening shortcode tag
         .     '[^\\]\\/]*'                   // Not a closing bracket or forward slash