diff options
| author | Mario <mario@mariovavti.com> | 2021-02-25 15:43:13 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-02-25 15:43:13 +0000 |
| commit | 36c9f9abff0d9d4c52d3307bb563d6fb5067ac7b (patch) | |
| tree | 1aab8961f183e93a45ed13657d0e3588d89a60c5 /include/channel.php | |
| parent | 8295ccdda75e2eefba0d377aaab7301f1c0760a2 (diff) | |
| parent | 65892ba5554c9dd19873cba9281c90d3a2b6d733 (diff) | |
| download | volse-hubzilla-36c9f9abff0d9d4c52d3307bb563d6fb5067ac7b.tar.gz volse-hubzilla-36c9f9abff0d9d4c52d3307bb563d6fb5067ac7b.tar.bz2 volse-hubzilla-36c9f9abff0d9d4c52d3307bb563d6fb5067ac7b.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/channel.php b/include/channel.php index a3c1611a9..c6ca673eb 100644 --- a/include/channel.php +++ b/include/channel.php @@ -891,7 +891,7 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals unset($ret['channel']['channel_salt']); } if ($zap_compat) { - unset($channel['channel_portable_id']); + unset($ret['channel']['channel_portable_id']); } } @@ -899,7 +899,6 @@ function identity_basic_export($channel_id, $sections = null, $zap_compat = fals $r = q("select * from profile where uid = %d", intval($channel_id) ); - if($r) { $ret['profile'] = $r; if ($zap_compat) { @@ -1099,11 +1098,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", |