Changeset 34933 for trunk/src/wp-includes/shortcodes.php

Timestamp:

10/08/2015 03:11:59 AM (10 years ago)

Author:

johnbillion

Message:

Abstract the shortcode attribute parsing regex into its own function, update the JavaScript counterpart, and introduce a test to ensure they do not diverge again.

Fixes #34191
Props miqrogroove, johnbillion

File:

• trunk/src/wp-includes/shortcodes.php (modified) (2 diffs)

trunk/src/wp-includes/shortcodes.php

@@ -452 +452 @@
 
 /**
+ * Retrieve the shortcode attributes regex.
+ *
+ * @since 4.4.0
+ *
+ * @return string The shortcode attribute regular expression
+ */
+function get_shortcode_atts_regex() {
+    return '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
+}
+
+/**
  * Retrieve all attributes from the shortcodes tag.
  *
@@ -468 +479 @@
 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 = get_shortcode_atts_regex();
     $text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
     if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {