aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-12-14 14:06:07 +0000
committerMario <mario@mariovavti.com>2020-12-17 14:23:09 +0100
commitc2e43dc1b0a88a27c0ae3af45bcbdfbae8c9f50c (patch)
tree2ef2c3e540996ef917217ca1e547f008237e3896 /Zotlabs
parent7b7739c32cd678d82683c4babe61bd8161b0b5d1 (diff)
downloadvolse-hubzilla-c2e43dc1b0a88a27c0ae3af45bcbdfbae8c9f50c.tar.gz
volse-hubzilla-c2e43dc1b0a88a27c0ae3af45bcbdfbae8c9f50c.tar.bz2
volse-hubzilla-c2e43dc1b0a88a27c0ae3af45bcbdfbae8c9f50c.zip
fix missing hubloc_id_url for zot hubloc when importing a channel
(cherry picked from commit 4693069a0618775167fd5c5b8c91b80f8a832da0)
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Import.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 2c6e09fa7..79842aa5e 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -68,7 +68,7 @@ class Import extends \Zotlabs\Web\Controller {
notice( t('Nothing to import.') . EOL);
return;
} else if(strpos($old_address, '@')) {
- // if you copy the identity address from your profile page, make it work for convenience - WARNING: this is a utf-8 variant and NOT an ASCII ampersand. Please do not edit.
+ // if you copy the identity address from your profile page, make it work for convenience - WARNING: this is a utf-8 variant and NOT an ASCII ampersand. Please do not edit.
$old_address = str_replace('@', '@', $old_address);
}
@@ -231,7 +231,8 @@ class Import extends \Zotlabs\Web\Controller {
'hubloc_host' => \App::get_hostname(),
'hubloc_callback' => z_root() . '/post',
'hubloc_sitekey' => get_config('system','pubkey'),
- 'hubloc_updated' => datetime_convert()
+ 'hubloc_updated' => datetime_convert(),
+ 'hubloc_id_url' => channel_url($channel)
]
);
@@ -442,7 +443,7 @@ class Import extends \Zotlabs\Web\Controller {
if(array_key_exists('abook_instance',$abook) && $abook['abook_instance'] && strpos($abook['abook_instance'],z_root()) === false) {
$abook['abook_not_here'] = 1;
- }
+ }
if($abook['abook_self']) {
$role = get_pconfig($channel['channel_id'],'system','permissions_role');