Ticket #17657: 17657.4.diff

wp-includes/shortcodes.php

@@ -181 +181 @@
                   '\\['                              // Opening bracket
                 . '(\\[?)'                           // 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
                 .     '(?:'

wp-includes/formatting.php

@@ -295 +295 @@
                 . '('                                // 1: The shortcode
                 .     '\\['                          // 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
                 .     '(?:'