aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Locs.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-09-23 11:44:10 +0000
committerMario <mario@mariovavti.com>2020-09-23 11:44:10 +0000
commit6f508b81d62f9fec91840d4b7a35eaa5209bdeca (patch)
treed5d6b2ac9a3fa5772950ce974b0766ba696ae933 /Zotlabs/Module/Locs.php
parent81e2f73c9870b502ab0b56009459932282f87f02 (diff)
downloadvolse-hubzilla-6f508b81d62f9fec91840d4b7a35eaa5209bdeca.tar.gz
volse-hubzilla-6f508b81d62f9fec91840d4b7a35eaa5209bdeca.tar.bz2
volse-hubzilla-6f508b81d62f9fec91840d4b7a35eaa5209bdeca.zip
5.0RC testing: update hublocs by hubloc_id_url of we mark it deleted or change primary to catch both zot and zot6 hublocs. only set the zot6 hubloc as primary.
Diffstat (limited to 'Zotlabs/Module/Locs.php')
-rw-r--r--Zotlabs/Module/Locs.php16
1 files changed, 9 insertions, 7 deletions
diff --git a/Zotlabs/Module/Locs.php b/Zotlabs/Module/Locs.php
index 63ca763a9..4c935a6a2 100644
--- a/Zotlabs/Module/Locs.php
+++ b/Zotlabs/Module/Locs.php
@@ -18,7 +18,7 @@ class Locs extends Controller {
$hubloc_id = intval($_REQUEST['primary']);
if($hubloc_id) {
- $r = q("select hubloc_id from hubloc where hubloc_id = %d and hubloc_hash = '%s' limit 1",
+ $r = q("select * from hubloc where hubloc_id = %d and hubloc_hash = '%s' limit 1",
intval($hubloc_id),
dbesc($channel['channel_hash'])
);
@@ -28,10 +28,11 @@ class Locs extends Controller {
return;
}
- $r = q("update hubloc set hubloc_primary = 0 where hubloc_primary = 1 and hubloc_hash = '%s' ",
- dbesc($channel['channel_hash'])
+ q("UPDATE hubloc SET hubloc_primary = 0 WHERE hubloc_primary = 1 AND (hubloc_hash = '%s' OR hubloc_hash = '%s')",
+ dbesc($channel['channel_hash']),
+ dbesc($channel['channel_portable_id'])
);
- $r = q("update hubloc set hubloc_primary = 1 where hubloc_id = %d and hubloc_hash = '%s'",
+ q("UPDATE hubloc SET hubloc_primary = 1 WHERE hubloc_id = %d AND hubloc_hash = '%s'",
intval($hubloc_id),
dbesc($channel['channel_hash'])
);
@@ -70,9 +71,10 @@ class Locs extends Controller {
}
}
- $r = q("update hubloc set hubloc_deleted = 1 where hubloc_id = %d and hubloc_hash = '%s'",
- intval($hubloc_id),
- dbesc($channel['channel_hash'])
+ q("UPDATE hubloc SET hubloc_deleted = 1 WHERE hubloc_id_url = '%s' AND (hubloc_hash = '%s' OR hubloc_hash = '%s')",
+ dbesc($r[0]['hubloc_id_url']),
+ dbesc($channel['channel_hash']),
+ dbesc($channel['channel_portable_id'])
);
Master::Summon( [ 'Notifier', 'refresh_all', $channel['channel_id'] ] );
return;