<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12750] trunk/wp-includes/shortcodes.php:
Make it obvious that do_shortcode_tag passes the tag as the third parameter
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12750">12750</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-01-17 22:51:15 +0000 (Sun, 17 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make it obvious that do_shortcode_tag passes the tag as the third parameter. plus code spacing cleanup.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesshortcodesphp">trunk/wp-includes/shortcodes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesshortcodesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/shortcodes.php (12749 => 12750)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/shortcodes.php 2010-01-17 09:31:37 UTC (rev 12749)
+++ trunk/wp-includes/shortcodes.php 2010-01-17 22:51:15 UTC (rev 12750)
</span><span class="lines">@@ -190,23 +190,23 @@
</span><span class="cx"> * @param array $m Regular expression match array
</span><span class="cx"> * @return mixed False on failure.
</span><span class="cx"> */
</span><del>-function do_shortcode_tag($m) {
</del><ins>+function do_shortcode_tag( $m ) {
</ins><span class="cx"> global $shortcode_tags;
</span><span class="cx">
</span><span class="cx"> // allow [[foo]] syntax for escaping a tag
</span><del>- if ($m[1] == '[' && $m[6] == ']') {
</del><ins>+ if ( $m[1] == '[' && $m[6] == ']' ) {
</ins><span class="cx"> return substr($m[0], 1, -1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $tag = $m[2];
</span><del>- $attr = shortcode_parse_atts($m[3]);
</del><ins>+ $attr = shortcode_parse_atts( $m[3] );
</ins><span class="cx">
</span><del>- if ( isset($m[5]) ) {
</del><ins>+ if ( isset( $m[5] ) ) {
</ins><span class="cx"> // enclosing tag - extra parameter
</span><del>- return $m[1] . call_user_func($shortcode_tags[$tag], $attr, $m[5], $m[2]) . $m[6];
</del><ins>+ return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6];
</ins><span class="cx"> } else {
</span><span class="cx"> // self-closing tag
</span><del>- return $m[1] . call_user_func($shortcode_tags[$tag], $attr, NULL, $m[2]) . $m[6];
</del><ins>+ return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, NULL, $tag ) . $m[6];
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>