diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-12-22 20:45:31 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-12-22 20:45:31 +0000 |
| commit | 3502a2e86b1d4924fea3b0eac6c3ce499eea2f16 (patch) | |
| tree | 823970af414e5c17ca660fc9cb8d5e6fefa8356d /include/Contact.php | |
| parent | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (diff) | |
| parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
| download | volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.gz volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.tar.bz2 volse-hubzilla-3502a2e86b1d4924fea3b0eac6c3ce499eea2f16.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/Contact.php')
| -rw-r--r-- | include/Contact.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/Contact.php b/include/Contact.php index 20dd04d17..59605e463 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -78,12 +78,16 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { $a = get_app(); if(! $xchan) { - if($a->profile['channel_hash']) + if($a->poi) { + $xchan = $a->poi; + } + elseif($a->profile['channel_hash']) { $r = q("select * from xchan where xchan_hash = '%s' limit 1", dbesc($a->profile['channel_hash']) ); if($r) $xchan = $r[0]; + } } if(! $xchan) |