diff options
| author | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 00:28:23 -0800 |
| commit | fd0b6c967fce4d8a82e9dad121ae7d8301d3f342 (patch) | |
| tree | 5c37812ef7baeadc17fce088c4394d25f75b593c /include/Contact.php | |
| parent | c993ddd86ee25832e35e65333fa25b396e7aefdf (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.gz volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.tar.bz2 volse-hubzilla-fd0b6c967fce4d8a82e9dad121ae7d8301d3f342.zip | |
Merge branch 'master' into pocorate
Diffstat (limited to 'include/Contact.php')
| -rw-r--r-- | include/Contact.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/Contact.php b/include/Contact.php index 4c80f5d6a..66062c279 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -98,10 +98,10 @@ function vcard_from_xchan($xchan, $observer = null, $mode = '') { // FIXME - show connect button to observer if appropriate $connect = false; - if(local_user()) { + if(local_channel()) { $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d limit 1", dbesc($xchan['xchan_hash']), - intval(local_user()) + intval(local_channel()) ); if(! $r) $connect = t('Connect'); @@ -351,7 +351,7 @@ function channel_remove($channel_id, $local = true, $unset_session=true) { proc_run('php','include/directory.php',$channel_id); - if($channel_id == local_user() && $unset_session) { + if($channel_id == local_channel() && $unset_session) { unset($_SESSION['authenticated']); unset($_SESSION['uid']); goaway($a->get_baseurl()); |