mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 16:26:59 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#1770

Browse Source
This commit is contained in:
Ryan Cramer
2023-06-29 15:10:43 -04:00
parent 19be4b3b90
commit 2349599aa8
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wire/core/MarkupFieldtype.php
View File

@@ -127,7 +127,8 @@ class MarkupFieldtype extends WireData implements Module {
}
return $this->arrayToString($a, false);
} else {
$value = $value->explode($property, array('getMethod' => 'getFormatted'));
$getMethod = strpos($property, '}') ? 'getText' : 'getFormatted';
$value = $value->explode($property, array('getMethod' => $getMethod));
}
$valid = true;

20
wire/core/Sanitizer.php
View File

@@ -1970,13 +1970,19 @@ class Sanitizer extends Wire {
if(strpos($value, '<') !== false) {
// tag replacements before strip_tags()
$regex =
'!<(?:' .
'/?(?:ul|ol|p|h\d|div)(?:>|\s[^><]*)' .
'|' .
'(?:br[\s/]*)' .
')>!is';
$value = preg_replace($regex, $newline, $value);
if(stripos($value, '</ul>') || stripos($value, '</ol>')) {
$regex = '!<(?:/?(?:ul|ol)(?:>|\s[^><]*))>!i';
$value = preg_replace($regex, '', $value);
}
if(stripos($value, '</p>') || stripos($value, '</h') || stripos($value, '</div>')) {
$regex =
'!<(?:' .
'/?(?:p|h\d|div)(?:>|\s[^><]*)' .
'|' .
'(?:br[\s/]*)' .
')>!is';
$value = preg_replace($regex, $newline, $value);
}
if(stripos($value, '</li>')) {
$value = preg_replace('!</li>\s*<li!is', "$options[separator]<li", $value);
}