lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Default email is not set correctly (Thanks lilipution for reporting)

Browse Source
This commit is contained in:
Laurent Destailleur 2008-08-29 07:18:44 +00:00
parent 5d8310fd7e
commit 0cc6534185
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/conf/conf.class.php
View File

@ -434,16 +434,16 @@ class Conf
}
// $this->notification->email_from = email pour envoi par Dolibarr des notifications
$this->notification->email_from=$this->email_from;
if (! empty($conf->global->NOTIFICATION_EMAIL_FROM))
if (! empty($this->global->NOTIFICATION_EMAIL_FROM))
{
$this->notification->email_from=$conf->global->NOTIFICATION_EMAIL_FROM;
$this->notification->email_from=$this->global->NOTIFICATION_EMAIL_FROM;
}
// $this->mailing->email_from = email pour envoi par Dolibarr des mailings
$this->mailing->email_from=$this->email_from;;
if (! empty($conf->global->MAILING_EMAIL_FROM))
if (! empty($this->global->MAILING_EMAIL_FROM))
{
$this->mailing->email_from=$conf->global->MAILING_EMAIL_FROM;
$this->mailing->email_from=$this->global->MAILING_EMAIL_FROM;
}
// Defini MAIN_GRAPH_LIBRARY