<!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" />
<title>[21828] trunk/wp-includes/formatting.php: When balancing tags, properly close tags that shouldn't be self-closed but are.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21828">21828</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-13 16:39:06 +0000 (Thu, 13 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>When balancing tags, properly close tags that shouldn't be self-closed but are. Support all self-closing tags.
props coffee2code.
fixes <a href="http://core.trac.wordpress.org/ticket/1597">#1597</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (21827 => 21828)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2012-09-12 15:48:40 UTC (rev 21827)
+++ trunk/wp-includes/formatting.php 2012-09-13 16:39:06 UTC (rev 21828)
</span><span class="lines">@@ -1155,8 +1155,10 @@
</span><span class="cx"> $stacksize = 0;
</span><span class="cx"> $tagqueue = '';
</span><span class="cx"> $newtext = '';
</span><del>- $single_tags = array( 'br', 'hr', 'img', 'input' ); // Known single-entity/self-closing tags
- $nestable_tags = array( 'blockquote', 'div', 'object', 'q', 'span' ); // Tags that can be immediately nested within themselves
</del><ins>+ // Known single-entity/self-closing tags
+ $single_tags = array( 'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source' );
+ // Tags that can be immediately nested within themselves
+ $nestable_tags = array( 'blockquote', 'div', 'object', 'q', 'span' );
</ins><span class="cx">
</span><span class="cx"> // WP bug fix for comments - in case you REALLY meant to type '< !--'
</span><span class="cx"> $text = str_replace('< !--', '< !--', $text);
</span><span class="lines">@@ -1203,26 +1205,35 @@
</span><span class="cx">
</span><span class="cx"> // Tag Cleaning
</span><span class="cx">
</span><del>- // If self-closing or '', don't do anything.
- if ( substr($regex[2],-1) == '/' || $tag == '' ) {
</del><ins>+ // If it's an empty tag "< >", do nothing
+ if ( '' == $tag ) {
</ins><span class="cx"> // do nothing
</span><span class="cx"> }
</span><ins>+ // ElseIf it presents itself as a self-closing tag...
+ elseif ( substr( $regex[2], -1 ) == '/' ) {
+ // ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
+ // immediately close it with a closing tag (the tag will encapsulate no text as a result)
+ if ( ! in_array( $tag, $single_tags ) )
+ $regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+ }
</ins><span class="cx"> // ElseIf it's a known single-entity tag but it doesn't close itself, do so
</span><span class="cx"> elseif ( in_array($tag, $single_tags) ) {
</span><span class="cx"> $regex[2] .= '/';
</span><del>- } else { // Push the tag onto the stack
</del><ins>+ }
+ // Else it's not a single-entity tag
+ else {
</ins><span class="cx"> // If the top of the stack is the same as the tag we want to push, close previous tag
</span><span class="cx"> if ( $stacksize > 0 && !in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag ) {
</span><del>- $tagqueue = '</' . array_pop ($tagstack) . '>';
</del><ins>+ $tagqueue = '</' . array_pop( $tagstack ) . '>';
</ins><span class="cx"> $stacksize--;
</span><span class="cx"> }
</span><del>- $stacksize = array_push ($tagstack, $tag);
</del><ins>+ $stacksize = array_push( $tagstack, $tag );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Attributes
</span><span class="cx"> $attributes = $regex[2];
</span><del>- if( !empty($attributes) )
- $attributes = ' '.$attributes;
</del><ins>+ if( ! empty( $attributes ) && $attributes[0] != '>' )
+ $attributes = ' ' . $attributes;
</ins><span class="cx">
</span><span class="cx"> $tag = '<' . $tag . $attributes . '>';
</span><span class="cx"> //If already queuing a close tag, then put this tag on, too
</span></span></pre>
</div>
</div>
</body>
</html>