summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-01-29 08:22:01 +0100
committerAleksander Machniak <alec@alec.pl>2013-01-29 08:23:40 +0100
commit6d5ad417d6e3e4963f6768378f389d2ee37573ce (patch)
tree95674a7e44160e5b8b105e1e2074dc583795b5c0 /plugins
parent6782fe1fd7d3230350153ba307dd5d49b9670604 (diff)
Fix "empty" ACL entry when there's "User, " in user input field
Diffstat (limited to 'plugins')
-rw-r--r--plugins/acl/acl.php2
-rw-r--r--plugins/acl/package.xml4
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 1952dad49..e69fa6a1e 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -441,7 +441,7 @@ class acl extends rcube_plugin
if (!empty($this->specials) && in_array($user, $this->specials)) {
$username = $this->gettext($user);
}
- else {
+ else if (!empty($user)) {
if (!strpos($user, '@') && ($realm = $this->get_realm())) {
$user .= '@' . rcube_idn_to_ascii(preg_replace('/^@/', '', $realm));
}
diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
index e5d411e18..578ab6138 100644
--- a/plugins/acl/package.xml
+++ b/plugins/acl/package.xml
@@ -13,9 +13,9 @@
<email>alec@alec.pl</email>
<active>yes</active>
</lead>
- <date>2012-06-28</date>
+ <date>2013-01-29</date>
<version>
- <release>1.0</release>
+ <release>1.1</release>
<api>0.7</api>
</version>
<stability>