- #45742: XHTML slash fix.

4.7.x
Steven Wittens 2006-01-25 22:29:57 +00:00
parent f4f77fc851
commit 548e5d2b5f
2 changed files with 4 additions and 4 deletions

View File

@ -1135,9 +1135,9 @@ function _filter_xss_split($m, $store = FALSE) {
}
// Is there a closing XHTML slash at the end of the attributes?
$attrlist = preg_replace('%(\s?)/\s*$%', '\1', $attrlist);
// in PHP 5.1.0 we could count the changes, currently we need this
// In PHP 5.1.0+ we could count the changes, currently we need a separate match
$xhtml_slash = preg_match('%\s?/\s*$%', $attrlist) ? ' /' : '';
$attrlist = preg_replace('%(\s?)/\s*$%', '\1', $attrlist);
// Clean up attributes
$attr2 = implode(' ', _filter_xss_attributes($attrlist));

View File

@ -1135,9 +1135,9 @@ function _filter_xss_split($m, $store = FALSE) {
}
// Is there a closing XHTML slash at the end of the attributes?
$attrlist = preg_replace('%(\s?)/\s*$%', '\1', $attrlist);
// in PHP 5.1.0 we could count the changes, currently we need this
// In PHP 5.1.0+ we could count the changes, currently we need a separate match
$xhtml_slash = preg_match('%\s?/\s*$%', $attrlist) ? ' /' : '';
$attrlist = preg_replace('%(\s?)/\s*$%', '\1', $attrlist);
// Clean up attributes
$attr2 = implode(' ', _filter_xss_attributes($attrlist));