Ticket #6444: 6444.autop.001.diff

File 6444.autop.001.diff, 2.0 kB (added by markjaquith, 3 months ago)

wp-includes/shortcodes.php

old	new
67	67	}
68	68
69	69	function do_shortcode($content) {
	70	$pattern = get_shortcode_regex();
	71	if ( !$pattern )
	72	return $content;
	73	else
	74	return preg_replace_callback('/' . $pattern . '/s', 'do_shortcode_tag', $content);
	75	}
	76
	77	// Note: this returns a partial regex for integration into a larger regex. Your final regex should use "/" as delimiters and use the "s" switch
	78	function get_shortcode_regex() {
70	79	global $shortcode_tags;
71	80
72	81	if (empty($shortcode_tags) \|\| !is_array($shortcode_tags))
73		return ~~$content~~;
	82	return false;
74	83
75	84	$tagnames = array_keys($shortcode_tags);
	85
76	86	$tagregexp = join( '\|', array_map('preg_quote', $tagnames) );
77
78		$pattern = '/\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?/s';
79
80		return preg_replace_callback($pattern, 'do_shortcode_tag', $content);
	87	return '\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?';
81	88	}
82	89
83	90	function do_shortcode_tag($m) {

old	new
74	74	$pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
75	75	$pee = preg_replace('/\n?(.+?)(?:\n\s*\n\|\z)/s', "<p>$1</p>\n", $pee); // make paragraphs, including one at the end
76	76	$pee = preg_replace('\|<p>\s*?</p>\|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
	77	$pee = preg_replace('/<p>(\s?' . get_shortcode_regex() . '\s)<\/p>/s', '$1', $pee); // don't auto-p wrap block-level shortcodes
77	78	$pee = preg_replace('!<p>([^<]+)\s?(</(?:div\|address\|form)[^>]>)!', "<p>$1</p>$2", $pee);
78	79	$pee = preg_replace( '\|<p>\|', "$1<p>", $pee );
79	80	$pee = preg_replace('!<p>\s(</?' . $allblocks . '[^>]>)\s*</p>!', "$1", $pee); // don't pee all over a tag