Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur
2024-01-06 16:56:28 +01:00
parent a999abfac2 d251f25830
commit 27fc5a2f84
10 changed files with 47 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/mails.php
View File

@@ -1033,7 +1033,7 @@ if ($action == 'edit') {
}
}
// Test SPF default automatic email from
$defaultnoreplyemail = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL');
$defaultnoreplyemail = getDolGlobalString('MAIN_MAIL_EMAIL_FROM');
if ($defaultnoreplyemail != $companyemail) { // We show if email differs
$dnsinfo = false;
if (!empty($defaultnoreplyemail) && function_exists('dns_get_record') && !getDolGlobalString('MAIN_DISABLE_DNS_GET_RECORD')) {