From 568c256aff7b3de3a01d8a7ad32ca24430c79948 Mon Sep 17 00:00:00 2001
From: itheiss <ingo.theiss@i-matrixx.de>
Date: Fri, 22 Mar 2013 10:07:06 +0100
Subject: [PATCH] Fix #2499
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The mail domain can now be configured in config.php and get´s used in function getDefaultEmailAddress.

e.g. 'mail_domain' => 'example.com'
---
 lib/public/util.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/public/util.php b/lib/public/util.php
index db07cbcfff3..6744c2d37bd 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -217,6 +217,7 @@ class Util {
 	 */
 	public static function getDefaultEmailAddress($user_part) {
 		$host_name = self::getServerHostName();
+		$host_name = \OC_Config::getValue('mail_domain', $host_name);
 		$defaultEmailAddress = $user_part.'@'.$host_name;
 
 		if (\OC_Mail::ValidateAddress($defaultEmailAddress)) {
-- 
2.39.5