From 3b5d46022dc74cf238c659d81de0af680128ea43 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Thu, 11 Sep 2008 07:48:49 +0000
Subject: [PATCH] "common::email_address() dont add @domain, if not domain
 (mail_suffix) specified"

---
 phpgwapi/inc/class.common.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 33bc6d8431..fa6fc06c76 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -1316,7 +1316,7 @@
 			$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
 				array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
 				$GLOBALS['egw_info']['server']['email_address_format'] ? $GLOBALS['egw_info']['server']['email_address_format'] : 'first-dot-last').
-				'@'.$domain;
+				($domain ? '@'.$domain : '');
 			//echo " = '$email'</p>\n";
 			return $email;
 		}