diff options
author | Mario <mario@mariovavti.com> | 2021-10-03 07:11:27 +0000 |
---|---|---|
committer | Mario <mario@mariovavti.com> | 2021-10-03 07:11:27 +0000 |
commit | 9de8aefa98e4ea040db41923c2089edc5efb01a8 (patch) | |
tree | b174225fd5b06afeefa34e89d6b57877c7544f08 /include/import.php | |
parent | 66c273ae8d54588dc83e1da6e67c71030abeefa3 (diff) | |
parent | b27fbf209e57e95c94de7667500ef8e7c63e638b (diff) | |
download | volse-hubzilla-9de8aefa98e4ea040db41923c2089edc5efb01a8.tar.gz volse-hubzilla-9de8aefa98e4ea040db41923c2089edc5efb01a8.tar.bz2 volse-hubzilla-9de8aefa98e4ea040db41923c2089edc5efb01a8.zip |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
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 f635f3705..6e25f4154 100644 --- a/include/import.php +++ b/include/import.php @@ -238,7 +238,8 @@ function import_hublocs($channel, $hublocs, $seize, $moving = false) { 'id' => $hubloc['hubloc_guid'], 'id_sig' => $hubloc['hubloc_guid_sig'], 'location' => $hubloc['hubloc_url'], - 'location_sig' => $hubloc['hubloc_url_sig'] + 'location_sig' => $hubloc['hubloc_url_sig'], + 'site_id' => $hubloc['hubloc_site_id'] ]; if (($hubloc['hubloc_hash'] === $channel['channel_hash']) && intval($hubloc['hubloc_primary']) && ($seize)) { |