aboutsummaryrefslogtreecommitdiffstats
path: root/include/channel.php
diff options
context:
space:
mode:
authornobody <nobody@zotlabs.com>2021-02-24 11:38:38 -0800
committernobody <nobody@zotlabs.com>2021-02-24 11:38:38 -0800
commitbeb418b093913bcc9499dac2722d53dfdab4879d (patch)
tree739ca3d948cb5574c479289f54cdceba707c7f58 /include/channel.php
parent0f89d2b8e06de56effc5e5f751c098a432e26e6a (diff)
parenta033c439f3486c6ce31fb5d680c363ce0582d451 (diff)
downloadvolse-hubzilla-beb418b093913bcc9499dac2722d53dfdab4879d.tar.gz
volse-hubzilla-beb418b093913bcc9499dac2722d53dfdab4879d.tar.bz2
volse-hubzilla-beb418b093913bcc9499dac2722d53dfdab4879d.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/channel.php')
-rw-r--r--include/channel.php5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/channel.php b/include/channel.php
index 5843dacf9..34bf6aa79 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -891,19 +891,14 @@ 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) {