diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-30 09:07:43 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-30 09:07:43 +0200 |
| commit | 6822415ee2efd4e2d3e5458c36cd5f582887969a (patch) | |
| tree | 30b7aaed9e4d8b56e3a062c95a92d8d276d027b3 /Zotlabs/Module/Connedit.php | |
| parent | e06e64823fbecbe67bcf59897ecad6b9c402744e (diff) | |
| parent | 6d0e1b0e07f26ee07d9f53732daab8ade12566d0 (diff) | |
| download | volse-hubzilla-6822415ee2efd4e2d3e5458c36cd5f582887969a.tar.gz volse-hubzilla-6822415ee2efd4e2d3e5458c36cd5f582887969a.tar.bz2 volse-hubzilla-6822415ee2efd4e2d3e5458c36cd5f582887969a.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
| -rw-r--r-- | Zotlabs/Module/Connedit.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php index f359175c1..cb9c19cf0 100644 --- a/Zotlabs/Module/Connedit.php +++ b/Zotlabs/Module/Connedit.php @@ -828,7 +828,7 @@ class Connedit extends \Zotlabs\Web\Controller { $locstr = locations_by_netid($contact['xchan_hash']); if(! $locstr) - $locstr = $contact['xchan_url']; + $locstr = unpunify($contact['xchan_url']); $clone_warn = ''; $clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false); @@ -852,8 +852,8 @@ class Connedit extends \Zotlabs\Web\Controller { '$permcat' => [ 'permcat', t('Permission role'), '', '<span class="loading invisible">' . t('Loading') . '<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span></span>',$permcats ], '$permcat_new' => t('Add permission role'), '$permcat_enable' => feature_enabled(local_channel(),'permcats'), - '$addr' => $contact['xchan_addr'], - '$primeurl' => $contact['xchan_url'], + '$addr' => unpunify($contact['xchan_addr']), + '$primeurl' => unpunify($contact['xchan_url']), '$section' => $section, '$sections' => $sections, '$vcard' => $vcard, |