diff options
author | zotlabs <mike@macgirvin.com> | 2019-01-28 02:48:57 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2019-01-28 02:48:57 -0800 |
commit | 043f7bf2abe069c7ac504e0b944db3c0e4318688 (patch) | |
tree | f9634791642a874745c079643b340c9396b64cd7 /Zotlabs/Module/Dreport.php | |
parent | 625cdde9a40d13b47a794c6202add2c8f647aebe (diff) | |
parent | e3d39fbf3fe99c6ce9de256290e83c49fea8808b (diff) | |
download | volse-hubzilla-043f7bf2abe069c7ac504e0b944db3c0e4318688.tar.gz volse-hubzilla-043f7bf2abe069c7ac504e0b944db3c0e4318688.tar.bz2 volse-hubzilla-043f7bf2abe069c7ac504e0b944db3c0e4318688.zip |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
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) ); |