aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2019-03-13 18:16:33 +0100
committerM. Dent <dentm42@gmail.com>2019-03-13 18:16:33 +0100
commit6ed7f47b3f2eff415d8abc4766b9c7d08227219d (patch)
tree5586190f08b8f115a7bfa27766444bfdc08fdda1
parent503da97a79e372c8b3d9d6718effa237171635ac (diff)
parenta3e94855f91c1c66fbd4c9ca5ca77386b944febd (diff)
downloadvolse-hubzilla-6ed7f47b3f2eff415d8abc4766b9c7d08227219d.tar.gz
volse-hubzilla-6ed7f47b3f2eff415d8abc4766b9c7d08227219d.tar.bz2
volse-hubzilla-6ed7f47b3f2eff415d8abc4766b9c7d08227219d.zip
Merge branch 'core_fixes_2' into 'dev'
add zot6 to clonable networks See merge request hubzilla/core!1552
-rw-r--r--Zotlabs/Module/Connedit.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index a587324df..acd7cb769 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -848,7 +848,7 @@ class Connedit extends \Zotlabs\Web\Controller {
$locstr = unpunify($contact['xchan_url']);
$clone_warn = '';
- $clonable = (in_array($contact['xchan_network'],['zot','rss']) ? true : false);
+ $clonable = (in_array($contact['xchan_network'],['zot', 'zot6', 'rss']) ? true : false);
if(! $clonable) {
$clone_warn = '<strong>';
$clone_warn .= ((intval($contact['abook_not_here']))