aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Connedit.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-08-01 03:59:32 +0200
committerMario Vavti <mario@mariovavti.com>2017-08-01 03:59:32 +0200
commit2f8c5cf7d09f7d079671785574b588bc21c373cd (patch)
treee1c12c4d39b8404d0d5870c57ebd91540fd2a37f /Zotlabs/Module/Connedit.php
parent1f2482f6abf5986ebf4b9ee292ba229a4a3b6797 (diff)
parent9476c631b0f9ba52be869b0c430fea81f4202352 (diff)
downloadvolse-hubzilla-2f8c5cf7d09f7d079671785574b588bc21c373cd.tar.gz
volse-hubzilla-2f8c5cf7d09f7d079671785574b588bc21c373cd.tar.bz2
volse-hubzilla-2f8c5cf7d09f7d079671785574b588bc21c373cd.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
-rw-r--r--Zotlabs/Module/Connedit.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index d301c2d45..0f18b432d 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -841,7 +841,7 @@ class Connedit extends \Zotlabs\Web\Controller {
}
}
else
- $locstr = t('none');
+ $locstr = $contact['xchan_url'];
$clone_warn = '';
$clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false);
@@ -866,6 +866,7 @@ class Connedit extends \Zotlabs\Web\Controller {
'$permcat_new' => t('Add permission role'),
'$permcat_enable' => feature_enabled(local_channel(),'permcats'),
'$addr' => $contact['xchan_addr'],
+ '$primeurl' => $contact['xchan_url'],
'$section' => $section,
'$sections' => $sections,
'$vcard' => $vcard,