diff --git a/src/Core/ACL.php b/src/Core/ACL.php index ba4564589d..f7b8924055 100644 --- a/src/Core/ACL.php +++ b/src/Core/ACL.php @@ -66,7 +66,7 @@ class ACL $tpl = Renderer::getMarkupTemplate('acl/message_recipient.tpl'); $o = Renderer::replaceMacros($tpl, [ - '$contacts' => $contacts, + '$contacts' => json_encode($contacts), '$selected' => $selected, ]); @@ -327,9 +327,9 @@ class ACL '$emtitle' => DI::l10n()->t('Example: bob@example.com, mary@example.com'), '$jotnets_summary' => DI::l10n()->t('Connectors'), '$visibility' => $visibility, - '$acl_contacts' => $acl_contacts, - '$acl_groups' => $acl_groups, - '$acl_list' => $acl_list, + '$acl_contacts' => json_encode($acl_contacts), + '$acl_groups' => json_encode($acl_groups), + '$acl_list' => json_encode($acl_list), '$contact_allow' => implode(',', $default_permissions['allow_cid']), '$group_allow' => implode(',', $default_permissions['allow_gid']), '$contact_deny' => implode(',', $default_permissions['deny_cid']), diff --git a/view/templates/acl/full_selector.tpl b/view/templates/acl/full_selector.tpl index ada05fbd41..a2329614eb 100644 --- a/view/templates/acl/full_selector.tpl +++ b/view/templates/acl/full_selector.tpl @@ -126,19 +126,19 @@ // Custom visibility tags inputs let acl_groups = new Bloodhound({ - local: {{$acl_groups|@json_encode nofilter}}, + local: {{$acl_groups nofilter}}, identify: function(obj) { return obj.type + '-' + obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name']), queryTokenizer: Bloodhound.tokenizers.whitespace, }); let acl_contacts = new Bloodhound({ - local: {{$acl_contacts|@json_encode nofilter}}, + local: {{$acl_contacts nofilter}}, identify: function(obj) { return obj.type + '-' + obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']), queryTokenizer: Bloodhound.tokenizers.whitespace, }); let acl = new Bloodhound({ - local: {{$acl_list|@json_encode nofilter}}, + local: {{$acl_list nofilter}}, identify: function(obj) { return obj.type + '-' + obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']), queryTokenizer: Bloodhound.tokenizers.whitespace, diff --git a/view/templates/acl/message_recipient.tpl b/view/templates/acl/message_recipient.tpl index 0e6d8c9395..b8aabf8c7f 100644 --- a/view/templates/acl/message_recipient.tpl +++ b/view/templates/acl/message_recipient.tpl @@ -9,7 +9,7 @@ let $recipient_input = $('[name="recipient"]'); let acl = new Bloodhound({ - local: {{$contacts|@json_encode nofilter}}, + local: {{$contacts nofilter}}, identify: function(obj) { return obj.id.toString(); }, datumTokenizer: Bloodhound.tokenizers.obj.whitespace(['name', 'addr']), queryTokenizer: Bloodhound.tokenizers.whitespace,