friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

Browse source 
Conflicts:
	include/config.php
	update.php
This commit is contained in:
Alexander Kampmann 2012-04-05 13:39:15 +02:00
commit 355c42cb30
1809 changed files with 48790 additions and 7152 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/email.php Executable file → Normal file
View file

@ -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;
}