Changeset 12750

Timestamp:

01/17/2010 10:51:15 PM (15 years ago)

Author:

markjaquith

Message:

Make it obvious that do_shortcode_tag passes the tag as the third parameter. plus code spacing cleanup.

File:

• trunk/wp-includes/shortcodes.php (modified) (1 diff)

trunk/wp-includes/shortcodes.php

@@ -191 +191 @@
  * @return mixed False on failure.
  */
-function do_shortcode_tag($m) {
+function do_shortcode_tag( $m ) {
     global $shortcode_tags;
 
     // allow [[foo]] syntax for escaping a tag
-    if ($m[1] == '[' && $m[6] == ']') {
+    if ( $m[1] == '[' && $m[6] == ']' ) {
         return substr($m[0], 1, -1);
     }
 
     $tag = $m[2];
-    $attr = shortcode_parse_atts($m[3]);
-
-    if ( isset($m[5]) ) {
+    $attr = shortcode_parse_atts( $m[3] );
+
+    if ( isset( $m[5] ) ) {
         // enclosing tag - extra parameter
-        return $m[1] . call_user_func($shortcode_tags[$tag], $attr, $m[5], $m[2]) . $m[6];
+        return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6];
     } else {
         // self-closing tag
-        return $m[1] . call_user_func($shortcode_tags[$tag], $attr, NULL, $m[2]) . $m[6];
+        return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, NULL,  $tag ) . $m[6];
     }
 }