aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-06-19 10:29:19 +0200
committerMax Kostikov <max@kostikov.co>2019-06-19 10:29:19 +0200
commit99a7cd3cfb3c8e59e4b18b562a69f113428cd5f2 (patch)
tree716e53d7d7ccf5aeb94fadf277d18b893156b715 /include
parent060dd8b02055e7c36f801f0df6666e39b5009315 (diff)
parent75746d714a2e7c7ae67fc03d24ddea6a61a2e5e1 (diff)
downloadvolse-hubzilla-99a7cd3cfb3c8e59e4b18b562a69f113428cd5f2.tar.gz
volse-hubzilla-99a7cd3cfb3c8e59e4b18b562a69f113428cd5f2.tar.bz2
volse-hubzilla-99a7cd3cfb3c8e59e4b18b562a69f113428cd5f2.zip
Merge branch 'dev' into 'dev'
Include Zot6 hubs in the Grid scope See merge request hubzilla/core!1676
Diffstat (limited to 'include')
-rw-r--r--include/zid.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zid.php b/include/zid.php
index ed79de76a..27ef0cefa 100644
--- a/include/zid.php
+++ b/include/zid.php
@@ -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) {