From a445cebdf94fcedf6f4b2b2fbb9d537d83a98b12 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 11 Aug 2008 07:10:22 +0000
Subject: #1485268

git-svn-id: https://svn.roundcube.net/trunk@1638 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_user.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index a57d67118..1d070854a 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/program/include/rcube_user.php
@@ -430,7 +430,7 @@ class rcube_user
   static function email2user($email)
   {
     $user = $email;
-    $r = self::findinvirtual("^$email\s");
+    $r = self::findinvirtual('^' . quotemeta($email) . '[[:space:]]');
 
     for ($i=0; $i<count($r); $i++)
     {
@@ -455,8 +455,8 @@ class rcube_user
    */
   static function user2email($user)
   {
-    $email = "";
-    $r = self::findinvirtual("\s$user\s*$");
+    $email = '';
+    $r = self::findinvirtual('[[:space:]]' . quotemeta($user) . '[[:space:]]*$');
 
     for ($i=0; $i<count($r); $i++)
     {
-- 
cgit v1.2.3