diff options
| author | Mario <mario@mariovavti.com> | 2021-02-25 15:10:41 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-02-25 15:10:41 +0000 |
| commit | 65892ba5554c9dd19873cba9281c90d3a2b6d733 (patch) | |
| tree | 0a3baccc8e244365433cad35ffc4530bc412718e /include | |
| parent | ac6dec91f1d1f6e5744a760cf006e40e88dcc8ba (diff) | |
| parent | 78938df13386ec60b8bb3e023d2f78db74fe8982 (diff) | |
| download | volse-hubzilla-65892ba5554c9dd19873cba9281c90d3a2b6d733.tar.gz volse-hubzilla-65892ba5554c9dd19873cba9281c90d3a2b6d733.tar.bz2 volse-hubzilla-65892ba5554c9dd19873cba9281c90d3a2b6d733.zip | |
Merge branch 'dev' into 'dev'
small adjustment
See merge request hubzilla/core!1915
Diffstat (limited to 'include')
| -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", |