aboutsummaryrefslogtreecommitdiffstats
path: root/include/email.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-28 19:57:28 -0700
committerfriendica <info@friendica.com>2012-03-28 19:57:28 -0700
commita946b7cea3e589fc08ca25d84e5d660efa5b3de6 (patch)
treeebf3ee7180161123f2befda27075c4a3a941853b /include/email.php
parent60fe74ce970468be187664198529dbd8d5a01a6c (diff)
parent75f3d41da2d85cb61ac627807011c312b96e3bb1 (diff)
downloadvolse-hubzilla-a946b7cea3e589fc08ca25d84e5d660efa5b3de6.tar.gz
volse-hubzilla-a946b7cea3e589fc08ca25d84e5d660efa5b3de6.tar.bz2
volse-hubzilla-a946b7cea3e589fc08ca25d84e5d660efa5b3de6.zip
Merge branch 'pull'
Diffstat (limited to 'include/email.php')
-rwxr-xr-xinclude/email.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/email.php b/include/email.php
index 8ea8145fb..bd44cb763 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']);