CS fixes after PR merge

2 files changed, 3 insertions, 3 deletions

diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index cc4d99661..349f7e518 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -115,7 +115,7 @@ class acl extends rcube_plugin
 
             if ($this->rc->config->get('acl_groups')) {
                 $prefix      = $this->rc->config->get('acl_group_prefix');
-                $group_field = $this->rc->config->get('acl_group_field') ? $this->rc->config->get('acl_group_field') : 'name';
+                $group_field = $this->rc->config->get('acl_group_field', 'name');
                 $result      = $this->ldap->list_groups($search, $mode);
 
                 foreach ($result as $record) {
@@ -123,7 +123,7 @@ class acl extends rcube_plugin
                     $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);
                         $keys[]  = $group;
                     }
                 }
diff --git a/plugins/acl/config.inc.php.dist b/plugins/acl/config.inc.php.dist
index d8ef8792c..ed7000267 100644
--- a/plugins/acl/config.inc.php.dist
+++ b/plugins/acl/config.inc.php.dist
@@ -23,7 +23,7 @@ $config['acl_groups'] = false;
 // Prefix added to the group name to build IMAP ACL identifier
 $config['acl_group_prefix'] = 'group:';
 
-// The LDAP attribute which will be used as ACL group identifier
+// The LDAP attribute (or field name) which will be used as ACL group identifier
 $config['acl_group_field'] = 'name';
 
 // Include the following 'special' access control subjects in the ACL dialog;