From 67b69478948cd1ee30f3eee26ca8208aebddea7a Mon Sep 17 00:00:00 2001 From: saxmatt Date: Fri, 6 Jun 2003 21:19:30 +0000 Subject: [PATCH] Ampersand fixer should be called outside of the texturize loop. git-svn-id: http://svn.automattic.com/wordpress/trunk@174 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- b2-include/b2functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/b2-include/b2functions.php b/b2-include/b2functions.php index 79b8735ef7..5ad8a9a2eb 100644 --- a/b2-include/b2functions.php +++ b/b2-include/b2functions.php @@ -53,7 +53,6 @@ function wptexturize($text) { $curl = preg_replace("/\(r\)/i", '®', $curl); $curl = str_replace("''", '”', $curl); - $curl = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $curl); $curl = preg_replace('/(d+)x(\d+)/', "$1×$2", $curl); @@ -82,6 +81,8 @@ function wpautop($pee, $br=1) { $pee = preg_replace('!()
!', "$1", $pee); $pee = preg_replace('|

]*)>|i', "

", $pee); $pee = str_replace('

', '

', $pee); + $pee = preg_replace('/&([^#])(?![a-z]{1,8};)/', '&$1', $pee); + return $pee; }