diff options
| author | thomascube <thomas@roundcube.net> | 2006-12-31 15:16:09 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2006-12-31 15:16:09 +0000 |
| commit | 18e2a3efd06b8ffe3b0d27707c6cf650e4ae56a3 (patch) | |
| tree | 30d6c8b322533cd96488693c92044d158fcf0ba5 | |
| parent | 2af4e4879ce3eddb52210731f397976534a07506 (diff) | |
Event handler removing again. Closes #1484200
| -rw-r--r-- | program/include/main.inc | 4 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index f04636a4d..d914e3ecb 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1088,9 +1088,9 @@ function Q($str, $mode='strict', $newlines=TRUE) * Quote a given string. Alias function for rep_specialchars_output * @see rep_specialchars_output */ -function JQ($str, $mode='strict', $newlines=TRUE) +function JQ($str) { - return rep_specialchars_output($str, 'js', $mode, $newlines); + return rep_specialchars_output($str, 'js'); } diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index b8c391aae..83f170d16 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1214,8 +1214,8 @@ function rcmail_mod_html_body($body, $container_id) while ($body != $prev_body) { $prev_body = $body; - $body = preg_replace('/(<[^!][^>]*?\s)(on[^=]+)(=[^>]*?>)/im', '$1__removed=$3', $body); - $body = preg_replace('/(<[^!][^>]*?\shref=["\']?)(javascript:)([^>]*?>)/im', '$1null:$3', $body); + $body = preg_replace('/(<[^!][^>]*\s)(on[^=>]+)=([^>]+>)/im', '$1__removed=$3', $body); + $body = preg_replace('/(<[^!][^>]*\shref=["\']?)(javascript:)([^>]*?>)/im', '$1null:$3', $body); } // resolve <base href> |