diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-05-17 09:27:17 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-05-17 09:27:17 +0200 |
| commit | efc470f0ac7587707665e92701e3937c9b6cc78d (patch) | |
| tree | 6674f2f57526f086e02755142f46901db74469c5 /program/steps/utils/html2text.inc | |
| parent | f1aaca6807742f7a890db152395d5c293b6e4e66 (diff) | |
| parent | c0a5aa5f5ff38ac7b8a650b07c134b7b86deb27f (diff) | |
Merge branch 'dev-text2html'
Conflicts:
program/js/app.js
Fix handling magic_quotes in rcube_text2html and rcube_html2text - move
stripslashes from these classes to action files
Diffstat (limited to 'program/steps/utils/html2text.inc')
| -rw-r--r-- | program/steps/utils/html2text.inc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc index 58df34bd0..f6e2bec4d 100644 --- a/program/steps/utils/html2text.inc +++ b/program/steps/utils/html2text.inc @@ -21,6 +21,11 @@ $html = stream_get_contents(fopen('php://input', 'r')); +// strip slashes if magic_quotes enabled +if (get_magic_quotes_gpc() || get_magic_quotes_runtime()) { + $html = stripslashes($html); +} + // Replace emoticon images with its text representation $html = $RCMAIL->replace_emoticons($html); |