summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/filter.module4
-rw-r--r--modules/filter/filter.module4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/filter.module b/modules/filter.module
index 492975721..79a3c2472 100644
--- a/modules/filter.module
+++ b/modules/filter.module
@@ -942,11 +942,11 @@ function _filter_html($text, $format) {
* Based on: http://photomatt.net/scripts/autop
*/
function _filter_autop($text) {
- // Split at <pre>, <script> and </pre>, </script> tags.
+ // Split at <pre>, <script>, <style> and </pre>, </script>, </style> tags.
// We don't apply any processing to the contents of these tags to avoid messing
// up code. We look for matched pairs and allow basic nesting. For example:
// "processed <pre> ignored <script> ignored </script> ignored </pre> processed"
- $chunks = preg_split('@(</?(?:pre|script)[^>]*>)@', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $chunks = preg_split('@(</?(?:pre|script|style)[^>]*>)@', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
// Note: PHP ensures the array consists of alternating delimiters and literals
// and begins and ends with a literal (inserting NULL as required).
$ignore = false;
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 492975721..79a3c2472 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -942,11 +942,11 @@ function _filter_html($text, $format) {
* Based on: http://photomatt.net/scripts/autop
*/
function _filter_autop($text) {
- // Split at <pre>, <script> and </pre>, </script> tags.
+ // Split at <pre>, <script>, <style> and </pre>, </script>, </style> tags.
// We don't apply any processing to the contents of these tags to avoid messing
// up code. We look for matched pairs and allow basic nesting. For example:
// "processed <pre> ignored <script> ignored </script> ignored </pre> processed"
- $chunks = preg_split('@(</?(?:pre|script)[^>]*>)@', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $chunks = preg_split('@(</?(?:pre|script|style)[^>]*>)@', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
// Note: PHP ensures the array consists of alternating delimiters and literals
// and begins and ends with a literal (inserting NULL as required).
$ignore = false;