Merge branch 'dev' into 'dev'
Include Zot6 hubs in the Grid scope See merge request hubzilla/core!1676
This commit is contained in:
		| @@ -13,7 +13,7 @@ function is_matrix_url($url) { | |||||||
| 		if(array_key_exists($m['host'],$remembered)) | 		if(array_key_exists($m['host'],$remembered)) | ||||||
| 			return $remembered[$m['host']]; | 			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']) | 			dbesc($m['host']) | ||||||
| 		); | 		); | ||||||
| 		if($r) { | 		if($r) { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user