Ticket #6444: 6444-no-p-wrap-shortcodes-r7811.patch

File 6444-no-p-wrap-shortcodes-r7811.patch, 1.8 kB (added by tellyworth, 3 months ago)
compromise: don't p-wrap stand-alone shortcodes

wordpress-2.5/wp-includes/shortcodes.php

old	new
72	72	if (empty($shortcode_tags) \|\| !is_array($shortcode_tags))
73	73	return $content;
74	74
	75	$pattern = get_shortcode_regex();
	76	return preg_replace_callback('/'.$pattern.'/s', 'do_shortcode_tag', $content);
	77	}
	78
	79	function get_shortcode_regex() {
	80	global $shortcode_tags;
75	81	$tagnames = array_keys($shortcode_tags);
76	82	$tagregexp = join( '\|', array_map('preg_quote', $tagnames) );
77	83
78		$pattern = '/\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?/s';
79
80		return preg_replace_callback($pattern, 'do_shortcode_tag', $content);
	84	return '\[('.$tagregexp.')\b(.*?)(?:(\/))?\](?:(.+?)\[\/\1\])?';
81	85	}
82	86
83	87	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 post-formatting 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