diff options
| author | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-01-20 12:58:27 +0100 |
|---|---|---|
| committer | Manuel Jiménez Friaza <mjfriaza@openmailbox.org> | 2019-01-20 12:58:27 +0100 |
| commit | 4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0 (patch) | |
| tree | 49111cffad0616616f4ce76fed9dd6b4fad8e41f /Zotlabs/Module/Dreport.php | |
| parent | 618d673947dc627dcdac3f9b6da7f31123472b05 (diff) | |
| parent | 39128c34ccf48cc23ed368cf5bbedd71b5ef75db (diff) | |
| download | volse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.tar.gz volse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.tar.bz2 volse-hubzilla-4e8fc6d19851b6d05a49d5151aaa1f0f1fcfb5c0.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
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) ); |