diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2014-01-27 04:27:35 -0800 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-01-27 04:27:35 -0800 |
| commit | b4d11df843de44c4999d2aa4ced66ffed9ae2a6b (patch) | |
| tree | c73f4208c8b01f215cc80c71dd392b34b0f5afb3 /lib | |
| parent | 6ee1250d276d524d2a3e4f22f259a5576150eac4 (diff) | |
| parent | 3ca85cd841bae985082318cba1d88bae9fdac65a (diff) | |
| download | nextcloud-server-b4d11df843de44c4999d2aa4ced66ffed9ae2a6b.tar.gz nextcloud-server-b4d11df843de44c4999d2aa4ced66ffed9ae2a6b.zip | |
Merge pull request #6930 from jcfischer/master
Add 'mail_from_address' configuration
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; |