aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Zot6
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-03-12 18:27:16 +0000
committerMario <mario@mariovavti.com>2020-03-12 18:27:16 +0000
commitc358aa2806717d1af6e47697f87e54b7c9967c9e (patch)
tree2bcf2fe7f7766f9d8d1453e67b8da20355b65338 /Zotlabs/Zot6
parentb23751128bafdc0e2d546517cab48f8095eed315 (diff)
downloadvolse-hubzilla-c358aa2806717d1af6e47697f87e54b7c9967c9e.tar.gz
volse-hubzilla-c358aa2806717d1af6e47697f87e54b7c9967c9e.tar.bz2
volse-hubzilla-c358aa2806717d1af6e47697f87e54b7c9967c9e.zip
first batch of zot6 transition patches. basic communication with transitioned channels *should* work now
Diffstat (limited to 'Zotlabs/Zot6')
-rw-r--r--Zotlabs/Zot6/Zot6Handler.php8
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) {