aboutsummaryrefslogtreecommitdiffstats
path: root/include/zid.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-06-26 21:54:50 -0700
committerzotlabs <mike@macgirvin.com>2019-06-26 21:54:50 -0700
commitd83ce0863abaf448b64c550999e070376fd71b71 (patch)
treea0f0b45249487bd471bcf0545dfbb23f7b871623 /include/zid.php
parentcf844cb27c02c3aae636eb1aa1587b1d5e3e81a0 (diff)
parent5ccef18d4e5b7901f78a11e0124c16e1c484e3bf (diff)
downloadvolse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.tar.gz
volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.tar.bz2
volse-hubzilla-d83ce0863abaf448b64c550999e070376fd71b71.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/zid.php')
-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) {