From 2a66b67174883b52145dc5c9c6643b6ddc26a84b Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Wed, 23 Nov 2016 06:43:14 -0500 Subject: [PATCH] Fix issue processwire/processwire-issues#92 where $sanitizer->markupToText() left useless trailing character when replacing br tags --- wire/core/Sanitizer.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/wire/core/Sanitizer.php b/wire/core/Sanitizer.php index 669a0e04..3d6c33aa 100644 --- a/wire/core/Sanitizer.php +++ b/wire/core/Sanitizer.php @@ -1070,9 +1070,10 @@ class Sanitizer extends Wire { if(strpos($value, '<') !== false) { // tag replacements before strip_tags() $regex = - '!(?:<' . - '/?(?:ul|ol|p|h\d|div)(?:>|\s[^><]*)' . - '|br[\s/]*' . + '!<(?:' . + '/?(?:ul|ol|p|h\d|div)(?:>|\s[^><]*)' . + '|' . + '(?:br[\s/]*)' . ')>!is'; $value = preg_replace($regex, $newline, $value); if(stripos($value, '')) {