diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-04-27 05:56:19 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-04-27 05:56:19 -0400 |
| commit | f975d9dfe457cb6912e7e0907406a86556537524 (patch) | |
| tree | 10c02ebfbd5f2acf1f2944b0f28f7c97c4b8454a /include/network.php | |
| parent | f027bf81cdaddee5d6474199c1b7adce50e6e07d (diff) | |
| parent | a6baa5a6da5f5231c119cab3170f68cf271f703b (diff) | |
| download | volse-hubzilla-f975d9dfe457cb6912e7e0907406a86556537524.tar.gz volse-hubzilla-f975d9dfe457cb6912e7e0907406a86556537524.tar.bz2 volse-hubzilla-f975d9dfe457cb6912e7e0907406a86556537524.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/network.php b/include/network.php index ec255581d..395641b73 100644 --- a/include/network.php +++ b/include/network.php @@ -2114,8 +2114,9 @@ function check_channelallowed($hash) { return $retvalue; } -function deliverable_singleton($xchan) { - $r = q("select abook_instance from abook where abook_xchan = '%s' limit 1", +function deliverable_singleton($channel_id,$xchan) { + $r = q("select abook_instance from abook where abook_channel = %d and abook_xchan = '%s' limit 1", + intval($channel_id), dbesc($xchan['xchan_hash']) ); if($r) { |