<!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>[12302] trunk/wp-includes: Separate the removal of <p>
wrapping from shortcodes into another function and apply it with different filter
, props miqrogroove, props mdawaffe, see #11257, see #11249</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12302">12302</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-12-01 07:46:36 +0000 (Tue, 01 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Separate the removal of <p> wrapping from shortcodes into another function and apply it with different filter, props miqrogroove, props mdawaffe, see <a href="http://trac.wordpress.org/ticket/11257">#11257</a>, see <a href="http://trac.wordpress.org/ticket/11249">#11249</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdefaultfiltersphp">trunk/wp-includes/default-filters.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-filters.php (12301 => 12302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-filters.php 2009-12-01 02:12:42 UTC (rev 12301)
+++ trunk/wp-includes/default-filters.php 2009-12-01 07:46:36 UTC (rev 12302)
</span><span class="lines">@@ -88,9 +88,10 @@
</span><span class="cx">
</span><span class="cx"> // Format text area for display.
</span><span class="cx"> foreach ( array( 'term_description' ) as $filter ) {
</span><del>- add_filter( $filter, 'wptexturize' );
- add_filter( $filter, 'convert_chars' );
- add_filter( $filter, 'wpautop' );
</del><ins>+ add_filter( $filter, 'wptexturize' );
+ add_filter( $filter, 'convert_chars' );
+ add_filter( $filter, 'wpautop' );
+ add_filter( $filter, 'shortcode_unautop');
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Format for RSS
</span><span class="lines">@@ -107,13 +108,15 @@
</span><span class="cx"> add_filter( 'the_content', 'convert_smilies' );
</span><span class="cx"> add_filter( 'the_content', 'convert_chars' );
</span><span class="cx"> add_filter( 'the_content', 'wpautop' );
</span><ins>+add_filter( 'the_content', 'shortcode_unautop' );
</ins><span class="cx"> add_filter( 'the_content', 'prepend_attachment' );
</span><span class="cx">
</span><del>-add_filter( 'the_excerpt', 'wptexturize' );
-add_filter( 'the_excerpt', 'convert_smilies' );
-add_filter( 'the_excerpt', 'convert_chars' );
-add_filter( 'the_excerpt', 'wpautop' );
-add_filter( 'get_the_excerpt', 'wp_trim_excerpt' );
</del><ins>+add_filter( 'the_excerpt', 'wptexturize' );
+add_filter( 'the_excerpt', 'convert_smilies' );
+add_filter( 'the_excerpt', 'convert_chars' );
+add_filter( 'the_excerpt', 'wpautop' );
+add_filter( 'the_excerpt', 'shortcode_unautop');
+add_filter( 'get_the_excerpt', 'wp_trim_excerpt' );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'comment_text', 'wptexturize' );
</span><span class="cx"> add_filter( 'comment_text', 'convert_chars' );
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (12301 => 12302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2009-12-01 02:12:42 UTC (rev 12301)
+++ trunk/wp-includes/formatting.php 2009-12-01 07:46:36 UTC (rev 12302)
</span><span class="lines">@@ -179,6 +179,7 @@
</span><span class="cx"> * @return string Text which has been converted into correct paragraph tags.
</span><span class="cx"> */
</span><span class="cx"> function wpautop($pee, $br = 1) {
</span><ins>+
</ins><span class="cx"> if ( trim($pee) === '' )
</span><span class="cx"> return '';
</span><span class="cx"> $pee = $pee . "\n"; // just to make things a little easier, pad the end
</span><span class="lines">@@ -216,12 +217,33 @@
</span><span class="cx"> if (strpos($pee, '<pre') !== false)
</span><span class="cx"> $pee = preg_replace_callback('!(<pre[^>]*>)(.*?)</pre>!is', 'clean_pre', $pee );
</span><span class="cx"> $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
</span><del>- $pee = preg_replace('/<p>\s*?(' . get_shortcode_regex() . ')\s*<\/p>/s', '$1', $pee); // don't auto-p wrap shortcodes that stand alone
</del><span class="cx">
</span><span class="cx"> return $pee;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Don't auto-p wrap shortcodes that stand alone
+ *
+ * Ensures that shortcodes are not wrapped in <<p>>...<</p>>.
+ *
+ * @since 2.9.0
+ *
+ * @param string $pee The content.
+ * @return string The filtered content.
+ */
+function shortcode_unautop($pee) {
+ global $shortcode_tags;
+
+ if ( !empty($shortcode_tags) && is_array($shortcode_tags) ) {
+ $tagnames = array_keys($shortcode_tags);
+ $tagregexp = join( '|', array_map('preg_quote', $tagnames) );
+ $pee = preg_replace('/<p>\\s*?(\\[(' . $tagregexp . ')\\b.*?\\/?\\](?:.+?\\[\\/\\2\\])?)\\s*<\\/p>/s', '$1', $pee);
+ }
+
+ return $pee;
+}
+
+/**
</ins><span class="cx"> * Checks to see if a string is utf8 encoded.
</span><span class="cx"> *
</span><span class="cx"> * NOTE: This function checks for 5-Byte sequences, UTF8
</span></span></pre>
</div>
</div>
</body>
</html>