harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #805 from zotlabs/mailexport

Browse Source 
minor export issue with mail
This commit is contained in:
git-marijus 2017-06-01 08:17:59 +02:00 committed by GitHub
commit 927313968a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/channel.php
View File

@ -736,14 +736,14 @@ function identity_basic_export($channel_id, $sections = null) {
$ret['conv'] = $r; $ret['conv'] = $r;
} }
$r = q("select * from mail where mail.uid = %d", $r = q("select * from mail where channel_id = %d",
intval($channel_id) intval($channel_id)
); );
if($r) { if($r) {
$m = array(); $m = array();
foreach($r as $rr) { foreach($r as $rr) {
xchan_mail_query($rr); xchan_mail_query($rr);
$m[] = mail_encode($rr,true); $m[] = encode_mail($rr,true);
} }
$ret['mail'] = $m; $ret['mail'] = $m;
} }

2
include/message.php
View File

@ -441,10 +441,12 @@ function private_messages_drop($channel_id, $messageitem_id, $drop_conversation
intval($channel_id) intval($channel_id)
); );
if($z) { if($z) {
if($x[0]['conv_guid']) {
q("delete from conv where guid = '%s' and uid = %d", q("delete from conv where guid = '%s' and uid = %d",
dbesc($x[0]['conv_guid']), dbesc($x[0]['conv_guid']),
intval($channel_id) intval($channel_id)
); );
}
$m['mail'] = array(); $m['mail'] = array();
foreach($z as $zz) { foreach($z as $zz) {
xchan_mail_query($zz); xchan_mail_query($zz);