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

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/zot.php
This commit is contained in:
redmatrix 2015-09-02 15:49:50 -07:00
commit 69fc10d5ad
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/zot.php
View File

@ -1637,10 +1637,9 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
} }
} }
$ab = q("select * from abook where abook_channel = %d and abook_xchan = '%s'",
$ab = q("select abook.* from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d intval($channel['channel_id']),
and abook_self = 0", dbesc($arr['owner_xchan'])
intval($channel['channel_id'])
); );
$abook = (($ab) ? $ab[0] : null); $abook = (($ab) ? $ab[0] : null);