diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/public/util.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/public/util.php b/lib/public/util.php index 8e85f9afc3f..6317f10a66f 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -254,8 +254,13 @@ class Util { * Example: when given lostpassword-noreply as $user_part param, * and is currently accessed via http(s)://example.com/, * it would return 'lostpassword-noreply@example.com' + * + * If the configuration value 'mail_from_address' is set in + * config.php, this value will override the $user_part that + * is passed to this function */ public static function getDefaultEmailAddress($user_part) { + $user_part = \OC_Config::getValue('mail_from_address', $user_part); $host_name = self::getServerHostName(); $host_name = \OC_Config::getValue('mail_domain', $host_name); $defaultEmailAddress = $user_part.'@'.$host_name; |