diff options
| author | Mario <mario@mariovavti.com> | 2020-03-28 11:12:22 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-03-28 11:12:22 +0100 |
| commit | 6e1c3b6d48224c7670b0291d3c7eb25475b1594d (patch) | |
| tree | ce6e5592f090595f390ab073e3ad4edaa727c8ee /Zotlabs/Zot6/Zot6Handler.php | |
| parent | 720d3dcedc96c7aaf6c4444c8b45acd46b8718b0 (diff) | |
| parent | bcdd75b8178309e5c4e65d170505ab60678c2159 (diff) | |
| download | volse-hubzilla-6e1c3b6d48224c7670b0291d3c7eb25475b1594d.tar.gz volse-hubzilla-6e1c3b6d48224c7670b0291d3c7eb25475b1594d.tar.bz2 volse-hubzilla-6e1c3b6d48224c7670b0291d3c7eb25475b1594d.zip | |
Merge branch 'z6connect' into 'dev'
Transition to zot6
See merge request hubzilla/core!1823
Diffstat (limited to 'Zotlabs/Zot6/Zot6Handler.php')
| -rw-r--r-- | Zotlabs/Zot6/Zot6Handler.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Zotlabs/Zot6/Zot6Handler.php b/Zotlabs/Zot6/Zot6Handler.php index 37ce11980..d717b147b 100644 --- a/Zotlabs/Zot6/Zot6Handler.php +++ b/Zotlabs/Zot6/Zot6Handler.php @@ -71,7 +71,7 @@ class Zot6Handler implements IHandler { foreach ($recipients as $recip) { $r = q("select channel.*,xchan.* from channel - left join xchan on channel_portable_id = xchan_hash + left join xchan on channel_hash = xchan_hash where xchan_hash ='%s' limit 1", dbesc($recip) ); @@ -139,7 +139,7 @@ class Zot6Handler implements IHandler { $arr = $data['recipients'][0]; - $c = q("select * from channel left join xchan on channel_portable_id = xchan_hash where channel_portable_id = '%s' limit 1", + $c = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_hash = '%s' limit 1", dbesc($arr['portable_id']) ); if (! $c) { @@ -227,8 +227,8 @@ class Zot6Handler implements IHandler { // basically this means "unfriend" foreach ($recipients as $recip) { $r = q("select channel.*,xchan.* from channel - left join xchan on channel_portable_id = xchan_hash - where channel_portable_id = '%s' limit 1", + left join xchan on channel_hash = xchan_hash + where channel_hash = '%s' limit 1", dbesc($recip) ); if ($r) { |