From c21d6d713e0320b7b61bff1fa0e05bbd250455bb Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 03 Nov 2008 03:01:18 -0500
Subject: [PATCH] Don't use addslashes() which could produce unexpected results when magic_quotes_sybase is on
---
program/include/main.inc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 4ed25af..43a3549 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -347,6 +347,8 @@
}
$xml_rep_table['"'] = '"';
+ $js_rep_table['"'] = '\\"';
+ $js_rep_table["'"] = "\\'";
}
// encode for XML
@@ -359,7 +361,7 @@
if ($charset!='UTF-8')
$str = rcube_charset_convert($str, RCMAIL_CHARSET,$charset);
- return preg_replace(array("/\r?\n/", "/\r/", '/<\\//'), array('\n', '\n', '<\\/'), addslashes(strtr($str, $js_rep_table)));
+ return preg_replace(array("/\r?\n/", "/\r/", '/<\\//'), array('\n', '\n', '<\\/'), strtr($str, $js_rep_table));
}
// no encoding given -> return original string
--
Gitblit v1.9.1