From 5d8310fd7e8d4d52126edec8a9dc04de0b975163 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Aug 2008 07:16:01 +0000 Subject: [PATCH] Fix: Default email is not set correctly (Thanks lilipution for reporting) --- htdocs/conf/conf.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index 11c3c6f0fad..681afa82c81 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -428,11 +428,10 @@ class Conf // $this->email_from = email pour envoi par dolibarr des mails automatiques $this->email_from = "dolibarr-robot@domain.com"; - if (! empty($conf->global->MAIN_MAIL_EMAIL_FROM)) + if (! empty($this->global->MAIN_MAIL_EMAIL_FROM)) { - $this->email_from = $conf->global->MAIN_MAIL_EMAIL_FROM; + $this->email_from = $this->global->MAIN_MAIL_EMAIL_FROM; } - // $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))