diff options
| author | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
| commit | 2c8a243ece79af05e30b1926bd372698d30f7aab (patch) | |
| tree | 9cc868f56a5456c59eb6e230803f2966c2ce9735 /include/import.php | |
| parent | 3372fb0761353f646ae2b7bd168650eea5fd6211 (diff) | |
| parent | af7a31cd1400a6b2f21e7c0a622ab448179f0ef8 (diff) | |
| download | volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.gz volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.bz2 volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Daemon/Expire.php
Diffstat (limited to 'include/import.php')
| -rw-r--r-- | include/import.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/import.php b/include/import.php index bfe71963f..910cb8be7 100644 --- a/include/import.php +++ b/include/import.php @@ -1,6 +1,7 @@ <?php use Zotlabs\Lib\IConfig; +use Zotlabs\Lib\Libzot; use Zotlabs\Web\HTTPSig; @@ -31,7 +32,7 @@ function import_channel($channel, $account_id, $seize, $newname = '') { // Ignore the hash provided and re-calculate - $channel['channel_hash'] = make_xchan_hash($channel['channel_guid'],$channel['channel_guid_sig']); + $channel['channel_hash'] = Libzot::make_xchan_hash($channel['channel_guid'],$channel['channel_pubkey']); if($newname) { $channel['channel_address'] = $newname; |