From 334eb48cfe87ad6bbb98a3da54727d12431ca872 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 Feb 2015 04:47:15 -0500
Subject: [PATCH] Merge branch 'release-1.1' of github.com:roundcube/roundcubemail into release-1.1
---
plugins/acl/acl.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 35a92bb..384faa3 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -123,7 +123,7 @@
$group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];
if ($group) {
- $users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group);
+ $users[] = array('name' => ($prefix ? $prefix : '') . $group_id, 'display' => $group, 'type' => 'group');
$keys[] = $group;
}
}
--
Gitblit v1.9.1