diff options
| author | M. Dent <dentm42@gmail.com> | 2019-01-18 06:15:01 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-01-18 06:15:01 +0100 |
| commit | bf879ce742d4a1fd77cb6e5de85adfdfc213ac58 (patch) | |
| tree | 7d50b69884c02c2cedd543e14265f8d27f60fa37 /Zotlabs/Module/Dreport.php | |
| parent | e89a3b05ece60ecb994e0dd4c2701164cabb0525 (diff) | |
| parent | 5aa0267936e391e1d1a98de5287546ad5817fb41 (diff) | |
| download | volse-hubzilla-bf879ce742d4a1fd77cb6e5de85adfdfc213ac58.tar.gz volse-hubzilla-bf879ce742d4a1fd77cb6e5de85adfdfc213ac58.tar.bz2 volse-hubzilla-bf879ce742d4a1fd77cb6e5de85adfdfc213ac58.zip | |
Merge branch 'dreport_fixes' into 'dev'
fix delivery report for zot6 connections
See merge request hubzilla/core!1476
Diffstat (limited to 'Zotlabs/Module/Dreport.php')
| -rw-r--r-- | Zotlabs/Module/Dreport.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Dreport.php b/Zotlabs/Module/Dreport.php index 16ae7941f..2c125b7a9 100644 --- a/Zotlabs/Module/Dreport.php +++ b/Zotlabs/Module/Dreport.php @@ -80,8 +80,9 @@ class Dreport extends \Zotlabs\Web\Controller { return; } - $r = q("select * from dreport where dreport_xchan = '%s' and dreport_mid = '%s'", + $r = q("select * from dreport where (dreport_xchan = '%s' or dreport_xchan = '%s') and dreport_mid = '%s'", dbesc($channel['channel_hash']), + dbesc($channel['channel_portable_id']), dbesc($mid) ); |