aboutsummaryrefslogtreecommitdiffstats
path: root/include
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
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')
-rw-r--r--include/acl_selectors.php7
-rw-r--r--include/conversation.php10
2 files changed, 8 insertions, 9 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'),
diff --git a/include/conversation.php b/include/conversation.php
index 7d1473fe2..637234bff 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1200,8 +1200,6 @@ function status_editor($a, $x, $popup = false) {
$tpl = get_markup_template('jot.tpl');
- $jotplugins = '';
-
$preview = t('Preview');
if(x($x, 'hide_preview'))
$preview = '';
@@ -1218,8 +1216,14 @@ function status_editor($a, $x, $popup = false) {
if(! $cipher)
$cipher = 'aes256';
+ $jotplugins = '';
call_hooks('jot_tool', $jotplugins);
+ $jotnets = '';
+ if(x($x,'jotnets')) {
+ call_hooks('jot_networks', $jotnets);
+ }
+
$o .= replace_macros($tpl, array(
'$return_path' => ((x($x, 'return_path')) ? $x['return_path'] : App::$query_string),
'$action' => z_root() . '/item',
@@ -1276,6 +1280,8 @@ function status_editor($a, $x, $popup = false) {
'$preview' => $preview,
'$source' => ((x($x, 'source')) ? $x['source'] : ''),
'$jotplugins' => $jotplugins,
+ '$jotnets' => $jotnets,
+ '$jotnets_label' => t('Other networks and post services'),
'$defexpire' => $defexpire,
'$feature_expire' => $feature_expire,
'$expires' => t('Set expiration date'),