diff options
author | redmatrix <git@macgirvin.com> | 2016-04-26 16:12:31 -0700 |
---|---|---|
committer | redmatrix <git@macgirvin.com> | 2016-04-26 16:12:31 -0700 |
commit | f99daf8ff9b3cd9c0ad61f9fcfec04c6c4042a59 (patch) | |
tree | b03a1659f3811475b5342f5c6aa56ffcca14f77b /include/network.php | |
parent | e508ad37c15a5c3c10bf0e6c117fe24859892acf (diff) | |
download | volse-hubzilla-f99daf8ff9b3cd9c0ad61f9fcfec04c6c4042a59.tar.gz volse-hubzilla-f99daf8ff9b3cd9c0ad61f9fcfec04c6c4042a59.tar.bz2 volse-hubzilla-f99daf8ff9b3cd9c0ad61f9fcfec04c6c4042a59.zip |
move iconfig functions to include/config.php with all the rest of the configs, fix an issue with singleton discovery and start work on singleton delivery
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) { |