diff options
| author | zottel <github@zottel.net> | 2012-03-29 10:23:45 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-03-29 10:23:45 +0200 |
| commit | 953840cf822718cba66a0727b576c674c6e44875 (patch) | |
| tree | a924cf0031d16f6f15b7d84d5f519ca4257042b4 /include/email.php | |
| parent | fb817a29a934a68f194a42c29d3ed11da2da558f (diff) | |
| parent | 3ee529d095ac7e83ae1e71d86cbe6d443885d54e (diff) | |
| download | volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.tar.gz volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.tar.bz2 volse-hubzilla-953840cf822718cba66a0727b576c674c6e44875.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/email.php')
| -rwxr-xr-x | include/email.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/email.php b/include/email.php index 8ea8145fb..b43ae0dc1 100755 --- a/include/email.php +++ b/include/email.php @@ -74,7 +74,7 @@ function email_msg_headers($mbox,$uid) { } -function email_get_msg($mbox,$uid) { +function email_get_msg($mbox,$uid, $reply) { $ret = array(); $struc = (($mbox && $uid) ? @imap_fetchstructure($mbox,$uid,FT_UID) : null); @@ -114,7 +114,7 @@ function email_get_msg($mbox,$uid) { $ret['body'] = removegpg($ret['body']); $msg = removesig($ret['body']); $ret['body'] = $msg['body']; - $ret['body'] = convertquote($ret['body'], false); + $ret['body'] = convertquote($ret['body'], $reply); if (trim($html) != '') $ret['body'] = removelinebreak($ret['body']); @@ -250,7 +250,7 @@ function email_header_encode($in_str, $charset) { // remove trailing spacer and // add start and end delimiters - $spacer = preg_quote($spacer); + $spacer = preg_quote($spacer,'/'); $out_str = preg_replace("/" . $spacer . "$/", "", $out_str); $out_str = $start . $out_str . $end; } |