diff options
| author | zotlabs <mike@macgirvin.com> | 2019-01-16 16:52:21 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2019-01-16 16:52:21 -0800 |
| commit | 7e29bd10b6a59bc9c1700cfb84dbefb6a8930153 (patch) | |
| tree | ac49731f7ed9a5071bd4fcf76faaa2003204064c /Zotlabs/Lib/DReport.php | |
| parent | 20eea2184bc1336efb811c29e3fb49262ae02262 (diff) | |
| parent | de8582ec07d125bf1c7f08cc3d695c33aaaf9d85 (diff) | |
| download | volse-hubzilla-7e29bd10b6a59bc9c1700cfb84dbefb6a8930153.tar.gz volse-hubzilla-7e29bd10b6a59bc9c1700cfb84dbefb6a8930153.tar.bz2 volse-hubzilla-7e29bd10b6a59bc9c1700cfb84dbefb6a8930153.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'Zotlabs/Lib/DReport.php')
| -rw-r--r-- | Zotlabs/Lib/DReport.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Zotlabs/Lib/DReport.php b/Zotlabs/Lib/DReport.php index 21b320cac..ef1ce2678 100644 --- a/Zotlabs/Lib/DReport.php +++ b/Zotlabs/Lib/DReport.php @@ -93,11 +93,19 @@ class DReport { if(! $c) return false; + // legacy zot recipients add a space and their name to the xchan. remove it if true. - // is the recipient one of our connections, or do we want to store every report? + $legacy_recipient = strpos($dr['recipient'], ' '); + if($legacy_recipient !== false) { + $legacy_recipient_parts = explode(' ', $dr['recipient'], 2); + $rxchan = $legacy_recipient_parts[0]; + } + else { + $rxchan = $dr['recipient']; + } + // is the recipient one of our connections, or do we want to store every report? - $rxchan = $dr['recipient']; $pcf = get_pconfig($c[0]['channel_id'],'system','dreport_store_all'); if($pcf) return true; |