aboutsummaryrefslogtreecommitdiffstats
path: root/include/email.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-03-17 11:07:49 +0100
committerMichael Vogel <icarus@dabo.de>2012-03-17 11:07:49 +0100
commit8a1f175df022e2fc2c2162aa314ea34454482d48 (patch)
tree08daca362b42d402322787f4e69810c2999ff791 /include/email.php
parentb5120888cf6e3aac29aa2a8d80bddcab73822e1e (diff)
downloadvolse-hubzilla-8a1f175df022e2fc2c2162aa314ea34454482d48.tar.gz
volse-hubzilla-8a1f175df022e2fc2c2162aa314ea34454482d48.tar.bz2
volse-hubzilla-8a1f175df022e2fc2c2162aa314ea34454482d48.zip
New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
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 a3449a424..43f04d7c2 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']);