summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-07-21 08:30:01 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-07-21 08:30:01 +0000
commit1ef48fc3294d40c49a4def0e0a8fe189ee45d001 (patch)
tree7d8177d987437d69402ca1fca4b5ae92c89aa6ae
parent6e21fd5c1af35435c9552f9541ceb0b102d2d787 (diff)
#1485207
git-svn-id: https://svn.roundcube.net/trunk@1599 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/rcube_user.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index 5f970ec6a..e4152e65e 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/program/include/rcube_user.php
@@ -420,11 +420,11 @@ class rcube_user
static function email2user($email)
{
$user = $email;
- $r = self::findinvirtual("^$email");
+ $r = self::findinvirtual("^$email\s");
for ($i=0; $i<count($r); $i++)
{
- $data = $r[$i];
+ $data = trim($r[$i]);
$arr = preg_split('/\s+/', $data);
if (count($arr) > 0)
{
@@ -446,7 +446,7 @@ class rcube_user
static function user2email($user)
{
$email = "";
- $r = self::findinvirtual("$user$");
+ $r = self::findinvirtual("\s$user\s*$");
for ($i=0; $i<count($r); $i++)
{