aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Import.php
diff options
context:
space:
mode:
authorredmatrix <mike@macgirvin.com>2016-09-17 14:51:57 -0700
committerredmatrix <mike@macgirvin.com>2016-09-17 14:51:57 -0700
commit0754da58da96316a9ff4505f9c7c712c1f0094b6 (patch)
tree4547950121b0ade42878ce9a4d5b7cb5430bf02d /Zotlabs/Module/Import.php
parent31df7af61f449d2fe307b3440c7dd7bf4b016cf0 (diff)
downloadvolse-hubzilla-0754da58da96316a9ff4505f9c7c712c1f0094b6.tar.gz
volse-hubzilla-0754da58da96316a9ff4505f9c7c712c1f0094b6.tar.bz2
volse-hubzilla-0754da58da96316a9ff4505f9c7c712c1f0094b6.zip
some changes merged from wrong branch... new function channel_reddress() instead of hardwired generation and which fixes case-sensitivity; allow dot notation in config and pconfig utils, updated string file
Diffstat (limited to 'Zotlabs/Module/Import.php')
-rw-r--r--Zotlabs/Module/Import.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index d27f013b9..9574de07c 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -209,7 +209,7 @@ class Import extends \Zotlabs\Web\Controller {
dbesc($channel['channel_guid']),
dbesc($channel['channel_guid_sig']),
dbesc($channel['channel_hash']),
- dbesc($channel['channel_address'] . '@' . \App::get_hostname()),
+ dbesc(channel_reddress($channel)),
dbesc('zot'),
intval(($seize) ? 1 : 0),
dbesc(z_root()),
@@ -252,7 +252,7 @@ class Import extends \Zotlabs\Web\Controller {
dbesc(z_root() . "/photo/profile/l/" . $channel['channel_id']),
dbesc(z_root() . "/photo/profile/m/" . $channel['channel_id']),
dbesc(z_root() . "/photo/profile/s/" . $channel['channel_id']),
- dbesc($channel['channel_address'] . '@' . \App::get_hostname()),
+ dbesc(channel_reddress($channel)),
dbesc(z_root() . '/channel/' . $channel['channel_address']),
dbesc(z_root() . '/follow?f=&url=%s'),
dbesc(z_root() . '/poco/' . $channel['channel_address']),