From 548e5d2b5f7ea6c4cd27e626df11ffbc23c1b3d4 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Wed, 25 Jan 2006 22:29:57 +0000
Subject: [PATCH] - #45742: XHTML slash fix.
---
modules/filter.module | 4 ++--
modules/filter/filter.module | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/filter.module b/modules/filter.module
index 0e345cce6663..422045543134 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -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));
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 0e345cce6663..422045543134 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -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));
--
GitLab