diff options
| author | redmatrix <mike@macgirvin.com> | 2016-09-17 14:51:57 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-09-17 14:51:57 -0700 |
| commit | 0754da58da96316a9ff4505f9c7c712c1f0094b6 (patch) | |
| tree | 4547950121b0ade42878ce9a4d5b7cb5430bf02d /Zotlabs/Module/Connect.php | |
| parent | 31df7af61f449d2fe307b3440c7dd7bf4b016cf0 (diff) | |
| download | volse-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/Connect.php')
| -rw-r--r-- | Zotlabs/Module/Connect.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Connect.php b/Zotlabs/Module/Connect.php index 962c05cce..dec375104 100644 --- a/Zotlabs/Module/Connect.php +++ b/Zotlabs/Module/Connect.php @@ -60,13 +60,13 @@ class Connect extends \Zotlabs\Web\Controller { $observer = \App::get_observer(); if(($observer) && ($_POST['submit'] === t('Continue'))) { if($observer['xchan_follow']) - $url = sprintf($observer['xchan_follow'],urlencode(\App::$data['channel']['channel_address'] . '@' . \App::get_hostname())); + $url = sprintf($observer['xchan_follow'],urlencode(channel_reddress(\App::$data['channel']))); if(! $url) { $r = q("select * from hubloc where hubloc_hash = '%s' order by hubloc_id desc limit 1", dbesc($observer['xchan_hash']) ); if($r) - $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(\App::$data['channel']['channel_address'] . '@' . \App::get_hostname()); + $url = $r[0]['hubloc_url'] . '/follow?f=&url=' . urlencode(channel_reddress(\App::$data['channel'])); } } if($url) |