harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

local_user => local_channel

Browse Source
This commit is contained in:
friendica
2015-01-28 20:56:04 -08:00
parent 54fd8b21db
commit a496036066
155 changed files with 886 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Contact.php
View File

@@ -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());