Merge branch 'dev' into 'dev'

Include Zot6 hubs in the Grid scope

See merge request hubzilla/core!1676
This commit is contained in:
Max Kostikov 2019-06-19 10:29:19 +02:00
commit 99a7cd3cfb

View File

@ -13,7 +13,7 @@ function is_matrix_url($url) {
if(array_key_exists($m['host'],$remembered))
return $remembered[$m['host']];
$r = q("select hubloc_url from hubloc where hubloc_host = '%s' and hubloc_network = 'zot' limit 1",
$r = q("select hubloc_url from hubloc where hubloc_host = '%s' and hubloc_network in ('zot', 'zot6') limit 1",
dbesc($m['host'])
);
if($r) {