Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev

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'),

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'),