From 0cc65341852e054622a593eb6282277db81b363e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 29 Aug 2008 07:18:44 +0000 Subject: [PATCH] Fix: Default email is not set correctly (Thanks lilipution for reporting) --- htdocs/conf/conf.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/conf/conf.class.php b/htdocs/conf/conf.class.php index 681afa82c81..7d2b6fa3271 100644 --- a/htdocs/conf/conf.class.php +++ b/htdocs/conf/conf.class.php @@ -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