joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Stable Release of version 2.8.5

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2018-07-30 08:10:50 +02:00
parent a6013c4b22
commit e36b84f301
10 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin/helpers/componentbuilderemail.php
View File

@ -121,17 +121,17 @@ abstract class ComponentbuilderEmail
$replyto = $conf->get('replyto');
$replytoname = $conf->get('replytoname');
}
// Set global sender
$mail->setSender(array($mailfrom, $fromname));
// set the global reply-to if found
if ($replyto && $replytoname)
{
$mail->ClearReplyTos();
$mail->addReplyTo( array( $replyto, $replytoname ) );
$mail->addReplyTo($replyto, $replytoname);
}
// Set global sender
$mail->setSender(array($mailfrom, $fromname));
// Default mailer is to use PHP's mail function
switch ($mailer)
{
@ -179,9 +179,6 @@ abstract class ComponentbuilderEmail
// set component params
$conf = self::getConfig();
// do some house cleaning
$mail->ClearReplyTos();
// set if we have override
if ($mailfrom && $fromname)
{