diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-15 09:36:51 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-15 09:36:51 +0200 |
| commit | 2848f5dab4e0f904280e77d6403ab69926cabe1d (patch) | |
| tree | bcb2f2a70660d7abe319b126035d2e0b2ddd2c41 /include/identity.php | |
| parent | 3c7d2d4cea80fae5113de8c78ed522ce8b32c16d (diff) | |
| parent | f0f5a8f2b510b92aa1fde2cbaf118a784c154432 (diff) | |
| download | volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.tar.gz volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.tar.bz2 volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/identity.php b/include/identity.php index bb905e18f..ad5bfbe6d 100644 --- a/include/identity.php +++ b/include/identity.php @@ -635,8 +635,12 @@ function identity_basic_export($channel_id, $items = false) { $r = q("select * from conv where uid = %d", intval($channel_id) ); - if($r) + if($r) { + for($x = 0; $x < count($r); $x ++) { + $r[$x]['subject'] = base64url_decode(str_rot47($r[$x]['subject'])); + } $ret['conv'] = $r; + } $r = q("select mail.*, conv.guid as conv_guid from mail left join conv on mail.convid = conv.id where mail.uid = %d", @@ -645,17 +649,11 @@ function identity_basic_export($channel_id, $items = false) { if($r) { $m = array(); foreach($r as $rr) { - - - - + $m[] = mail_encode($rr,true); } $ret['mail'] = $m; } - - - $r = q("select item_id.*, item.mid from item_id left join item on item_id.iid = item.id where item_id.uid = %d", intval($channel_id) ); |