diff options
| author | thomascube <thomas@roundcube.net> | 2008-04-05 12:49:21 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2008-04-05 12:49:21 +0000 |
| commit | e70d6ea64e711096af36b1234f8545b870ea5f45 (patch) | |
| tree | 98e784b95d08418d85a17af767037e8a6e0f3f41 /program/include/rcube_user.inc | |
| parent | cb1330b7b10ce46e466850b27300a06ed122501e (diff) | |
Apply changes from trunk to 0.1-stable
Diffstat (limited to 'program/include/rcube_user.inc')
| -rw-r--r-- | program/include/rcube_user.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/program/include/rcube_user.inc b/program/include/rcube_user.inc index 41b424f1d..e748758a9 100644 --- a/program/include/rcube_user.inc +++ b/program/include/rcube_user.inc @@ -361,7 +361,7 @@ class rcube_user // try to resolve user in virtusertable if (!empty($CONFIG['virtuser_file']) && !strpos($user, '@')) - $user_email = self::user2email($user); + $user_email = rcube_user::user2email($user); $DB->query( "INSERT INTO ".get_table_name('users')." @@ -468,7 +468,7 @@ class rcube_user $arr = preg_split('/\s+/', $data); if (count($arr) > 0) { - $email = trim($arr[0]); + $email = trim(str_replace('\\@', '@', $arr[0])); break; } } |