aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2020-08-25 06:48:22 +0200
committerMario Vavti <mario@mariovavti.com>2020-08-25 06:48:22 +0200
commit1fbc6fa431aa820382f1a457644f5307efc68c90 (patch)
tree744a39d6d29de494c6672092c90e3e1f4690b35e
parent6177ec9134b458865ebf382a6e03827bb1834365 (diff)
downloadvolse-hubzilla-1fbc6fa431aa820382f1a457644f5307efc68c90.tar.gz
volse-hubzilla-1fbc6fa431aa820382f1a457644f5307efc68c90.tar.bz2
volse-hubzilla-1fbc6fa431aa820382f1a457644f5307efc68c90.zip
add check against null
-rw-r--r--Zotlabs/Module/Fhubloc_id_url.php6
-rw-r--r--Zotlabs/Update/_1238.php6
2 files changed, 8 insertions, 4 deletions
diff --git a/Zotlabs/Module/Fhubloc_id_url.php b/Zotlabs/Module/Fhubloc_id_url.php
index eb86b702d..3d27df4fa 100644
--- a/Zotlabs/Module/Fhubloc_id_url.php
+++ b/Zotlabs/Module/Fhubloc_id_url.php
@@ -33,7 +33,8 @@ class Fhubloc_id_url extends \Zotlabs\Web\Controller {
LEFT JOIN xchan ON hubloc.hubloc_hash = xchan.xchan_hash
SET hubloc.hubloc_id_url = xchan.xchan_url
WHERE hubloc.hubloc_network IN ('activitypub', 'diaspora', 'friendica-over-diaspora', 'gnusoc')
- AND hubloc.hubloc_id_url = ''"
+ AND hubloc.hubloc_id_url = ''
+ AND xchan.xchan_url IS NOT NULL"
);
}
@@ -50,7 +51,8 @@ class Fhubloc_id_url extends \Zotlabs\Web\Controller {
FROM xchan
WHERE hubloc_hash = xchan_hash
AND hubloc_network IN ('activitypub', 'diaspora', 'friendica-over-diaspora', 'gnusoc')
- AND hubloc_id_url = ''"
+ AND hubloc_id_url = ''
+ AND xchan_url IS NOT NULL"
);
diff --git a/Zotlabs/Update/_1238.php b/Zotlabs/Update/_1238.php
index 533358219..364763ee4 100644
--- a/Zotlabs/Update/_1238.php
+++ b/Zotlabs/Update/_1238.php
@@ -35,7 +35,8 @@ class _1238 {
LEFT JOIN xchan ON hubloc.hubloc_hash = xchan.xchan_hash
SET hubloc.hubloc_id_url = xchan.xchan_url
WHERE hubloc.hubloc_network IN ('activitypub', 'diaspora', 'friendica-over-diaspora', 'gnusoc')
- AND hubloc.hubloc_id_url = ''"
+ AND hubloc.hubloc_id_url = ''
+ AND xchan.xchan_url IS NOT NULL"
);
}
if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
@@ -51,7 +52,8 @@ class _1238 {
FROM xchan
WHERE hubloc_hash = xchan_hash
AND hubloc_network IN ('activitypub', 'diaspora', 'friendica-over-diaspora', 'gnusoc')
- AND hubloc_id_url = ''"
+ AND hubloc_id_url = ''
+ AND xchan_url IS NOT NULL"
);
}