diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-12-31 15:16:09 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2006-12-31 15:16:09 +0000 |
| commit | 75c786cf1e1bb53bccc8efca3e83d9f3059f1482 (patch) | |
| tree | c89f01b8fda5ab5631d1068e6ef84460089f791c | |
| parent | fc15db763489237bf73076a8b9ef8732438bd9a0 (diff) | |
Event handler removing again. Closes #1484200
git-svn-id: https://svn.roundcube.net/trunk@444 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/program/include/main.inc | 4 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index f04636a4d..d914e3ecb 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/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/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index b8c391aae..83f170d16 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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> |