<!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>[9601] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php: Support: Attempt to fix standalone `<li>` tags, take two.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/9601">9601</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/9601","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-03-18 04:11:37 +0000 (Wed, 18 Mar 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Support: Attempt to fix standalone `<li>` tags, take two.
This change operates a little differently to <a href="http://meta.trac.wordpress.org/changeset/9438">[9438]</a> in which it operates on chunks of the content instead, to treat standalone `<li>`s differntly than those wrapped in `<ul>` or `<ol>` tags.
Unfortunately this doesn't support nested lists, and instead attempts to convert those to non-nested lists.
Fixes <a href="http://meta.trac.wordpress.org/ticket/20">#20</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgsupportfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php 2020-03-17 23:49:28 UTC (rev 9600)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php 2020-03-18 04:11:37 UTC (rev 9601)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,11 +604,54 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Filtered content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_support_wrap_standalone_li_tags_in_ul( $content ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $content, '<li>' ) ) {
- $content = preg_replace( '#(?<!<ul>\s|<ol>\s)<li>#', '<ul><li>', $content );
- $content = force_balance_tags( $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // No lists? No worries.
+ if ( false === stripos( $content, '<li>' ) ) {
+ return $content;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Split the content into chunks of <Not a List, OL/UL tags, Content of Ol/UL tags>.
+ $parts = preg_split( '#(<[uo]l(?:\s+[^>]+)?>)#im', $content, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE );
+
+ // We can rebuild.
+ $content = '';
+
+ for ( $i = 0; $i < count( $parts ); $i++ ) {
+ $part = $parts[ $i ];
+ $next_part = $parts[ $i + 1 ] ?? '';
+
+ // If the chunk is a list element, process it as such.
+ if ( preg_match( '#^<([uo]l)(\s+[^>]+)?>#i', $part, $m ) ) {
+ $closing_tag_pos = stripos( $next_part, '</' . $m[1] . '>' );
+ if ( false !== $closing_tag_pos ) {
+ // List is closed, assume that part of the content is OK
+ $content .= $part . substr( $next_part, 0, $closing_tag_pos + 5 );
+
+ // But check the content after the list too.
+ $next_part = substr( $next_part, $closing_tag_pos + 5 );
+ if ( $next_part ) {
+ // Replace the first li tag if one exists.
+ // This may break nested lists, but that's okay.
+ $next_part = preg_replace( '#<li>#i', '<ul><li>', $next_part, 1 );
+
+ $content .= force_balance_tags( $next_part );
+ }
+ } else {
+ // List is not closed, balance it.
+ $content .= force_balance_tags( $part . $next_part );
+ }
+ $i++; // Skip $next_part;
+
+ // Does this text chunk contain a <li>? If so, it's got no matching start element.
+ } elseif ( false !== stripos( $part, '<li>' ) ) {
+ $part = preg_replace( '#<li>#i', '<ul><li>', $part, 1 ); // Replace the first li tag
+ $content .= force_balance_tags( $part );
+
+ // This shouldn't actually be hit, but is here for completeness.
+ } else {
+ $content .= force_balance_tags( $part );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_get_topic_content', 'wporg_support_wrap_standalone_li_tags_in_ul', 50 );
</span></span></pre>
</div>
</div>
</body>
</html>