From 8a1f175df022e2fc2c2162aa314ea34454482d48 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 17 Mar 2012 11:07:49 +0100 Subject: New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements --- include/email.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/email.php') 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']); -- cgit v1.2.3 From 4e4f7ac79fe5f75ee5595c3a6eb7d3e445c8c6e2 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 28 Mar 2012 20:50:09 -0700 Subject: some reported warnings cleaned up --- include/email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/email.php') diff --git a/include/email.php b/include/email.php index bd44cb763..b43ae0dc1 100755 --- a/include/email.php +++ b/include/email.php @@ -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; } -- cgit v1.2.3