aboutsummaryrefslogtreecommitdiffstats
path: root/include/acl_selectors.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-08-21 16:34:42 -0700
committerredmatrix <git@macgirvin.com>2016-08-21 16:34:42 -0700
commit9a057623d6d83ce4b7f40b2479628fa14335c556 (patch)
tree7da62eb162b2c26116923bf5995d6499f840b4c8 /include/acl_selectors.php
parent4d34d9c03269ea9b8ca038a87f5351cfe4dbeff1 (diff)
parentb6a545b4a279061c7e786dbfe4d63679bfe18e07 (diff)
downloadvolse-hubzilla-9a057623d6d83ce4b7f40b2479628fa14335c556.tar.gz
volse-hubzilla-9a057623d6d83ce4b7f40b2479628fa14335c556.tar.bz2
volse-hubzilla-9a057623d6d83ce4b7f40b2479628fa14335c556.zip
Merge branch 'git-marijus-dev' into dev
Diffstat (limited to 'include/acl_selectors.php')
-rw-r--r--include/acl_selectors.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 9bee942e2..362776b44 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -148,11 +148,6 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
array_walk($deny_cid,'fixacl');
array_walk($deny_gid,'fixacl');
}
-
- $jotnets = '';
- if($show_jotnets) {
- call_hooks('jot_networks', $jotnets);
- }
$r = q("SELECT id, hash, gname FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC",
intval(local_channel())
@@ -181,8 +176,6 @@ function populate_acl($defaults = null,$show_jotnets = true, $emptyACL_descripti
'$allowgid' => json_encode($allow_gid),
'$denycid' => json_encode($deny_cid),
'$denygid' => json_encode($deny_gid),
- '$jnetModalTitle' => t('Other networks and post services'),
- '$jotnets' => $jotnets,
'$aclModalTitle' => t('Permissions'),
'$aclModalDesc' => $dialog_description,
'$aclModalDismiss' => t('Close'),