Ticket #25615: correct-wording-for-wpautop.patch

wp-includes/formatting.php

@@ -181 +181 @@
  *
  * @since 0.71
  *
- * @param string $pee The text which has to be formatted.
+ * @param string $text The text which has to be formatted.
  * @param bool $br Optional. If set, this will convert all remaining line-breaks after paragraphing. Default true.
  * @return string Text which has been converted into correct paragraph tags.
  */
-function wpautop($pee, $br = true) {
+function wpautop($text, $br = true) {
         $pre_tags = array();
 
-        if ( trim($pee) === '' )
+        if ( trim($text) === '' )
                 return '';
 
-        $pee = $pee . "\n"; // just to make things a little easier, pad the end
+        $text = $text . "\n"; // just to make things a little easier, pad the end
 
-        if ( strpos($pee, '<pre') !== false ) {
-                $pee_parts = explode( '</pre>', $pee );
-                $last_pee = array_pop($pee_parts);
-                $pee = '';
+        if ( strpos($text, '<pre') !== false ) {
+                $text_parts = explode( '</pre>', $text );
+                $last_part = array_pop($text_parts);
+                $text = '';
                 $i = 0;
 
-                foreach ( $pee_parts as $pee_part ) {
-                        $start = strpos($pee_part, '<pre');
+                foreach ( $text_parts as $text_part ) {
+                        $start = strpos($text_part, '<pre');
 
                         // Malformed html?
                         if ( $start === false ) {
-                                $pee .= $pee_part;
+                                $text .= $text_part;
                                 continue;
                         }
 
                         $name = "<pre wp-pre-tag-$i></pre>";
-                        $pre_tags[$name] = substr( $pee_part, $start ) . '</pre>';
+                        $pre_tags[$name] = substr( $text_part, $start ) . '</pre>';
 
-                        $pee .= substr( $pee_part, 0, $start ) . $name;
+                        $text .= substr( $text_part, 0, $start ) . $name;
                         $i++;
                 }
 
-                $pee .= $last_pee;
+                $text .= $last_part;
         }
 
-        $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
+        $text = preg_replace('|<br />\s*<br />|', "\n\n", $text);
         // Space things out a little
         $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|option|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
-        $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
-        $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
-        $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
-        if ( strpos($pee, '<object') !== false ) {
-                $pee = preg_replace('|\s*<param([^>]*)>\s*|', "<param$1>", $pee); // no pee inside object/embed
-                $pee = preg_replace('|\s*</embed>\s*|', '</embed>', $pee);
+        $text = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $text);
+        $text = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $text);
+        $text = str_replace(array("\r\n", "\r"), "\n", $text); // cross-platform newlines
+        if ( strpos($text, '<object') !== false ) {
+                $text = preg_replace('|\s*<param([^>]*)>\s*|', "<param$1>", $text); // no paragraph inside object/embed
+                $text = preg_replace('|\s*</embed>\s*|', '</embed>', $text);
         }
-        $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
+        $text = preg_replace("/\n\n+/", "\n\n", $text); // take care of duplicates
         // make paragraphs, including one at the end
-        $pees = preg_split('/\n\s*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY);
-        $pee = '';
-        foreach ( $pees as $tinkle )
-                $pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
-        $pee = preg_replace('|<p>\s*</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
-        $pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
-        $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
-        $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee); // problem with nested lists
-        $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
-        $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
-        $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
-        $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+        $texts = preg_split('/\n\s*\n/', $text, -1, PREG_SPLIT_NO_EMPTY);
+        $text = '';
+        foreach ( $texts as $paragraph )
+                $text .= '<p>' . trim($paragraph, "\n") . "</p>\n";
+        $text = preg_replace('|<p>\s*</p>|', '', $text); // under certain strange conditions it could create a P of entirely whitespace
+        $text = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $text);
+        $text = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $text); // don't wrap blocks
+        $text = preg_replace("|<p>(<li.+?)</p>|", "$1", $text); // problem with nested lists
+        $text = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $text);
+        $text = str_replace('</blockquote></p>', '</p></blockquote>', $text);
+        $text = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $text);
+        $text = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $text);
         if ( $br ) {
-                $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
-                $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks
-                $pee = str_replace('<WPPreserveNewline />', "\n", $pee);
+                $text = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $text);
+                $text = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $text); // optionally make line breaks
+                $text = str_replace('<WPPreserveNewline />', "\n", $text);
         }
-        $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
-        $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-        $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
+        $text = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $text);
+        $text = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $text);
+        $text = preg_replace( "|\n</p>$|", '</p>', $text );
 
         if ( !empty($pre_tags) )
-                $pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+                $text = str_replace(array_keys($pre_tags), array_values($pre_tags), $text);
 
-        return $pee;
+        return $text;
 }
 
 /**
@@ -277 +277 @@
  *
  * @since 2.9.0
  *
- * @param string $pee The content.
+ * @param string $text The content.
  * @return string The filtered content.
  */
-function shortcode_unautop( $pee ) {
+function shortcode_unautop( $text ) {
         global $shortcode_tags;
 
         if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
-                return $pee;
+                return $text;
         }
 
         $tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
@@ -321 +321 @@
                 . '<\\/p>'                           // closing paragraph
                 . '/s';
 
-        return preg_replace( $pattern, '$1', $pee );
+        return preg_replace( $pattern, '$1', $text );
 }
 
 /**