New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use email_user variable as from name for emails if available #8550

Merged
merged 2 commits into from Apr 12, 2018

Conversation

Projects
None yet
3 participants
@laf
Member

laf commented Apr 11, 2018

DO NOT DELETE THIS TEXT

Please note

Please read this information carefully. You can run ./scripts/pre-commit.php to check your code before submitting.

Testers

If you would like to test this pull request then please run: ./scripts/github-apply <pr_id>, i.e ./scripts/github-apply 5926

I wouldn't call this a bug but fixed anyway. Fixes: #7910

@laf laf added the Alerting 🔔 label Apr 11, 2018

@@ -932,6 +932,9 @@ function send_mail($emails, $subject, $message, $html = false)
$mail->Hostname = php_uname('n');
foreach (parse_email($config['email_from']) as $from => $from_name) {
if (empty($from_name)) {
$from_name = Config::get('email_user', null);

This comment has been minimized.

@murrant

murrant Apr 12, 2018

Member

null is the default for "default", so no need to specify it here.

@laf

This comment has been minimized.

Member

laf commented Apr 12, 2018

Updated, thanks,

@scrutinizer-notifier

This comment has been minimized.

scrutinizer-notifier commented Apr 12, 2018

The inspection completed: 1 updated code elements

@murrant murrant merged commit 2ee4ea2 into librenms:master Apr 12, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@laf laf deleted the laf:fix/issue-7910 branch Apr 12, 2018

TheMysteriousX added a commit to TheMysteriousX/librenms that referenced this pull request May 20, 2018

fix: Use email_user variable as from name for emails if available (li…
…brenms#8550)

* fix: Use email_user variable as from name for emails if available

* Update functions.php

@lock lock bot locked as resolved and limited conversation to collaborators Jun 11, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.