Changeset 12302 for trunk/wp-includes/formatting.php

Timestamp:

12/01/2009 07:46:36 AM (14 years ago)

Author:

azaozz

Message:

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

File:

• trunk/wp-includes/formatting.php (modified) (2 diffs)

trunk/wp-includes/formatting.php

@@ -180 +180 @@
  */
 function wpautop($pee, $br = 1) {
+
     if ( trim($pee) === '' )
         return '';
@@ -217 +218 @@
         $pee = preg_replace_callback('!(<pre[^>]*>)(.*?)</pre>!is', 'clean_pre', $pee );
     $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
-    $pee = preg_replace('/<p>\s*?(' . get_shortcode_regex() . ')\s*<\/p>/s', '$1', $pee); // don't auto-p wrap shortcodes that stand alone
+
+    return $pee;
+}
+
+/**
+ * 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;