diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-01-29 08:22:01 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-01-29 08:22:01 +0100 |
| commit | b61041e655d122139b9bf75a85b170a15eaeb48e (patch) | |
| tree | f028b208642fbd0f7c929aeaf6feea318314e039 | |
| parent | 737b629c6f947b956cacf188c2f6d6a410c36f3a (diff) | |
Fix "empty" ACL entry when there's "User, " in user input field
| -rw-r--r-- | plugins/acl/acl.php | 2 | ||||
| -rw-r--r-- | plugins/acl/package.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php index 5ae9e4e0a..eb8433a27 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_utils::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> |