diff options
| author | Mario <mario@mariovavti.com> | 2021-02-24 10:19:15 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-02-24 10:19:15 +0000 |
| commit | a033c439f3486c6ce31fb5d680c363ce0582d451 (patch) | |
| tree | 1d9dd9a5b7e4e428bfa5bb423934929bb50c85ca | |
| parent | 66e4bc327fc0dfdb0fd139455941cb15004e8df1 (diff) | |
| download | volse-hubzilla-a033c439f3486c6ce31fb5d680c363ce0582d451.tar.gz volse-hubzilla-a033c439f3486c6ce31fb5d680c363ce0582d451.tar.bz2 volse-hubzilla-a033c439f3486c6ce31fb5d680c363ce0582d451.zip | |
zap compat export fixes
| -rw-r--r-- | include/channel.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/include/channel.php b/include/channel.php index 5843dacf9..a3c1611a9 100644 --- a/include/channel.php +++ b/include/channel.php @@ -891,19 +891,15 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals unset($ret['channel']['channel_salt']); } if ($zap_compat) { - $channel['channel_guid_sig'] = 'sha256.' . $channel['channel_guid_sig']; - $channel['channel_hash'] = $channel['channel_portable_id']; unset($channel['channel_portable_id']); } - - } if(in_array('channel',$sections) || in_array('profile',$sections)) { $r = q("select * from profile where uid = %d", intval($channel_id) ); - + if($r) { $ret['profile'] = $r; if ($zap_compat) { @@ -1103,11 +1099,11 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals // @fixme - Not totally certain how to handle $zot_compat for the event timezone which exists // in Hubzilla but is stored with the item and not the event. In Zap, stored information is - // always UTC and localised on access as per standard conventions for working with global time data. + // always UTC and localised on access as per standard conventions for working with global time data. // Older Zot (pre-Zot6) records aren't translated correctly w/r/t AS2 so only include events for the last year or so if - // migrating to Zap. - + // migrating to Zap. + $sqle = (($zap_compat) ? " and created > '2020-01-01 00:00:00' " : ''); $r = q("select * from event where uid = %d $sqle", |