Ticket #9045: 9045_shortcode.diff

C:/xampp/htdocs/wordpress_trunk/wp-includes/shortcodes.php

@@ -8 +8 @@
  *
  * [shortcode /]
  * [shortcode foo="bar" baz="bing" /]
+ * [shortcode 12345 foo="bar" baz="bing" /]
  * [shortcode foo="bar"]content[/shortcode]
  *
  * Shortcode tags support attributes and enclosed content, but does not entirely
@@ -199 +200 @@
  * Retrieve all attributes from the shortcodes tag.
  *
  * The attributes list has the attribute name as the key and the value of the
- * attribute as the value in the key/value pair. This allows for easier
- * retrieval of the attributes, since all attributes have to be known.
+ * attribute as the value in the key/value pair. 
+ * In addition, use default numeric index for unpaired attributes  
+ * This allows for easier retrieval of the attributes, since all attributes have to be known.
  *
  * @since 2.5
  *
@@ -224 +226 @@
                         elseif (isset($m[8]))
                                 $atts[] = stripcslashes($m[8]);
                 }
-        } else {
-                $atts = ltrim($text);
+        } 
+        
+        $unpaired_attrs = preg_replace( $pattern, '', $text ); 
+        $unpaired_attrs = trim( $unpaired_attrs ); 
+        if ( empty($unpaired_attrs) )
+                return $atts;
+        
+        if ( preg_match_all('/(\w+)\s*/', $unpaired_attrs, $unpaired_matches, PREG_SET_ORDER) ) {
+                foreach( $unpaired_matches as $m )
+                        $atts[] = $m[1]; 
         }
+        
         return $atts;
 }