diff options
| author | zotlabs <mike@macgirvin.com> | 2018-05-02 23:18:09 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-05-02 23:18:09 -0700 |
| commit | 75c8f656c9cb6d4b664cccd2e72e23499547d088 (patch) | |
| tree | 9cc3e0ed340283fe168bb904c911248a2f7fd661 /include | |
| parent | 459ec78a5e3cb09ee908fd7810bbb0b80b2e4713 (diff) | |
| parent | d83f12e883e79b7268677f8981579102c48ca00b (diff) | |
| download | volse-hubzilla-75c8f656c9cb6d4b664cccd2e72e23499547d088.tar.gz volse-hubzilla-75c8f656c9cb6d4b664cccd2e72e23499547d088.tar.bz2 volse-hubzilla-75c8f656c9cb6d4b664cccd2e72e23499547d088.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/connections.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/connections.php b/include/connections.php index e5bf07d96..32baa94bd 100644 --- a/include/connections.php +++ b/include/connections.php @@ -127,7 +127,7 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { return replace_macros(get_markup_template('xchan_vcard.tpl'),array( '$name' => $xchan['xchan_name'], '$photo' => ((is_array(App::$profile) && array_key_exists('photo',App::$profile)) ? App::$profile['photo'] : $xchan['xchan_photo_l']), - '$follow' => $xchan['xchan_addr'], + '$follow' => (($xchan['xchan_addr']) ? $xchan['xchan_addr'] : $xchan['xchan_url']), '$link' => zid($xchan['xchan_url']), '$connect' => $connect, '$newwin' => (($mode === 'chanview') ? t('New window') : ''), |