Merge branch 'master' into WebGUI8
This commit is contained in:
commit
2400f19099
797 changed files with 33894 additions and 27196 deletions
|
|
@ -337,7 +337,7 @@ sub getInboxNotificationTemplateId {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getInboxSMSNotificationTemplateId ( )
|
||||
=head2 getInboxSmsNotificationTemplateId ( )
|
||||
|
||||
This method returns the template ID for inbox SMS notifications.
|
||||
|
||||
|
|
@ -947,7 +947,8 @@ sub www_inviteUserSave {
|
|||
my $invitation = WebGUI::Mail::Send->create(
|
||||
$session, {
|
||||
to => $to,
|
||||
from => $email,
|
||||
from => $session->setting->get('companyEmail'),
|
||||
replyTo => $email,
|
||||
subject => $subject,
|
||||
}
|
||||
);
|
||||
|
|
@ -957,9 +958,9 @@ sub www_inviteUserSave {
|
|||
|
||||
my $emailBody = $self->processTemplate( $var, $self->getInviteUserMessageTemplateId );
|
||||
|
||||
$invitation->addText($emailBody);
|
||||
$invitation->addHtml($emailBody);
|
||||
|
||||
$invitation->send;
|
||||
$invitation->queue;
|
||||
|
||||
} ## end for my $inviteeEmail (@toList)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue