aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-28 20:17:05 -0700
committerredmatrix <git@macgirvin.com>2016-04-28 20:17:05 -0700
commit30a6ae3daa42da8d1d9560fcc4c706b3e41c4d80 (patch)
tree427320cf413107425758629f4a4ce7341438bd4e
parent37a852d2d17fe2a499eeacb64e4e223210979926 (diff)
downloadvolse-hubzilla-30a6ae3daa42da8d1d9560fcc4c706b3e41c4d80.tar.gz
volse-hubzilla-30a6ae3daa42da8d1d9560fcc4c706b3e41c4d80.tar.bz2
volse-hubzilla-30a6ae3daa42da8d1d9560fcc4c706b3e41c4d80.zip
This setting isn't implemented so remove the UI until it is.
-rw-r--r--Zotlabs/Module/Admin.php2
-rwxr-xr-xview/tpl/admin_security.tpl3
2 files changed, 1 insertions, 4 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index 1ff9065cd..1d37b41bc 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -725,7 +725,7 @@ class Admin extends \Zotlabs\Web\Controller {
'$embed_allow' => array('embed_allow', t('Allow embedded HTML content only from these domains'), $whiteembeds_str, t('One site per line. Leave empty to allow from any site by default')),
'$embed_deny' => array('embed_deny', t('Block embedded HTML from these domains'), $blackembeds_str, ''),
- '$embed_coop' => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')),
+// '$embed_coop' => array('embed_coop', t('Cooperative embed security'), $embed_coop, t('Enable to share embed security with other compatible sites/hubs')),
'$submit' => t('Submit')
));
}
diff --git a/view/tpl/admin_security.tpl b/view/tpl/admin_security.tpl
index 691db2d88..3823d8235 100755
--- a/view/tpl/admin_security.tpl
+++ b/view/tpl/admin_security.tpl
@@ -15,9 +15,6 @@
{{include file="field_textarea.tpl" field=$whitelisted_channels}}
{{include file="field_textarea.tpl" field=$blacklisted_channels}}
-
- {{include file="field_checkbox.tpl" field=$embed_coop}}
-
{{include file="field_textarea.tpl" field=$embed_allow}}
{{include file="field_textarea.tpl" field=$embed_deny}}