diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-07-31 17:34:26 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-07-31 17:34:26 +0200 |
commit | 2fcbbfe3d4d8f9dd7b11f60adb116fe8e6c9f2f6 (patch) | |
tree | 40c16020494bc05710cb9c602dda4473ab024c1c /Zotlabs/Module/Connedit.php | |
parent | 9ec995dbf072eb3143cae2b11a89522577a005ff (diff) | |
parent | 445fa6825a20876441d07c28f7b7bbd2c8fd064c (diff) | |
download | volse-hubzilla-2fcbbfe3d4d8f9dd7b11f60adb116fe8e6c9f2f6.tar.gz volse-hubzilla-2fcbbfe3d4d8f9dd7b11f60adb116fe8e6c9f2f6.tar.bz2 volse-hubzilla-2fcbbfe3d4d8f9dd7b11f60adb116fe8e6c9f2f6.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Connedit.php')
-rw-r--r-- | Zotlabs/Module/Connedit.php | 3 |
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, |