aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-03-29 02:26:25 -0700
committerzotlabs <mike@macgirvin.com>2018-03-29 02:26:25 -0700
commit33bb89729cdb7d8cc462253fd2b984e2e2bf4471 (patch)
treebb0268bb6117e64ab4462f37d5b62d16043714b3 /Zotlabs/Module
parentcd485b0fdf159ed30b73d7bf84d132ab3af9a418 (diff)
downloadvolse-hubzilla-33bb89729cdb7d8cc462253fd2b984e2e2bf4471.tar.gz
volse-hubzilla-33bb89729cdb7d8cc462253fd2b984e2e2bf4471.tar.bz2
volse-hubzilla-33bb89729cdb7d8cc462253fd2b984e2e2bf4471.zip
hubzilla issue #1019 - punycode urls on connedit page when displaying locations
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Connedit.php6
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,