import wpautop from wp3
This commit is contained in:
		
							parent
							
								
									2c687145da
								
							
						
					
					
						commit
						08ab6692cf
					
				@ -75,11 +75,28 @@
 | 
				
			|||||||
		return $text;
 | 
							return $text;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Replaces double line-breaks with paragraph elements.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * A group of regex replaces used to identify text formatted with newlines and
 | 
				
			||||||
 | 
					 * replace double line-breaks with HTML paragraph tags. The remaining
 | 
				
			||||||
 | 
					 * line-breaks after conversion become <<br />> tags, unless $br is set to '0'
 | 
				
			||||||
 | 
					 * or 'false'.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @since 0.71
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @param string $pee The text which has to be formatted.
 | 
				
			||||||
 | 
					 * @param int|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 = 1) {
 | 
					function wpautop($pee, $br = 1) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if ( trim($pee) === '' )
 | 
				
			||||||
 | 
							return '';
 | 
				
			||||||
	$pee = $pee . "\n"; // just to make things a little easier, pad the end
 | 
						$pee = $pee . "\n"; // just to make things a little easier, pad the end
 | 
				
			||||||
	$pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
 | 
						$pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
 | 
				
			||||||
	// Space things out a little
 | 
						// Space things out a little
 | 
				
			||||||
	$allblocks = '(?:table|thead|tfoot|caption|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|select|form|map|area|blockquote|address|math|style|input|p|h[1-6]|hr)';
 | 
						$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|input|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
 | 
				
			||||||
	$pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
 | 
						$pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
 | 
				
			||||||
	$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
 | 
						$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
 | 
				
			||||||
	$pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
 | 
						$pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
 | 
				
			||||||
@ -93,9 +110,8 @@ function wpautop($pee, $br = 1) {
 | 
				
			|||||||
	$pee = '';
 | 
						$pee = '';
 | 
				
			||||||
	foreach ( $pees as $tinkle )
 | 
						foreach ( $pees as $tinkle )
 | 
				
			||||||
		$pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
 | 
							$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>\s*</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
 | 
				
			||||||
	$pee = preg_replace('!<p>([^<]+)\s*?(</(?:div|address|form)[^>]*>)!', "<p>$1</p>$2", $pee);
 | 
						$pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
 | 
				
			||||||
	$pee = preg_replace( '|<p>|', "$1<p>", $pee );
 | 
					 | 
				
			||||||
	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
 | 
						$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>(<li.+?)</p>|", "$1", $pee); // problem with nested lists
 | 
				
			||||||
	$pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
 | 
						$pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
 | 
				
			||||||
@ -103,20 +119,30 @@ function wpautop($pee, $br = 1) {
 | 
				
			|||||||
	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
 | 
						$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
 | 
				
			||||||
	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
 | 
						$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
 | 
				
			||||||
	if ($br) {
 | 
						if ($br) {
 | 
				
			||||||
		$pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', create_function('$matches', 'return str_replace("\n", "<WPPreserveNewline />", $matches[0]);'), $pee);
 | 
							$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 = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks
 | 
				
			||||||
		$pee = str_replace('<WPPreserveNewline />', "\n", $pee);
 | 
							$pee = str_replace('<WPPreserveNewline />', "\n", $pee);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
 | 
						$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('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
 | 
				
			||||||
	if (strpos($pee, '<pre') !== false)
 | 
						if (strpos($pee, '<pre') !== false)
 | 
				
			||||||
		$pee = preg_replace_callback('!(<pre.*?>)(.*?)</pre>!is', 'clean_pre', $pee );
 | 
							$pee = preg_replace_callback('!(<pre[^>]*>)(.*?)</pre>!is', 'clean_pre', $pee );
 | 
				
			||||||
	$pee = preg_replace( "|\n</p>$|", '</p>', $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;
 | 
						return $pee;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Newline preservation help function for wpautop
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * @since 3.1.0
 | 
				
			||||||
 | 
					 * @access private
 | 
				
			||||||
 | 
					 * @param array $matches preg_replace_callback matches array
 | 
				
			||||||
 | 
					 * @returns string
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					function _autop_newline_preservation_helper( $matches ) {
 | 
				
			||||||
 | 
						return str_replace("\n", "<WPPreserveNewline />", $matches[0]);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	function seems_utf8($Str) { # by bmorel at ssi dot fr
 | 
						function seems_utf8($Str) { # by bmorel at ssi dot fr
 | 
				
			||||||
		for ($i=0; $i<strlen($Str); $i++) {
 | 
							for ($i=0; $i<strlen($Str); $i++) {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user