From 1fbc6fa431aa820382f1a457644f5307efc68c90 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 25 Aug 2020 06:48:22 +0200 Subject: add check against null --- Zotlabs/Module/Fhubloc_id_url.php | 6 ++++-- Zotlabs/Update/_1238.php | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'Zotlabs') 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" ); } -- cgit v1.2.3