Merge pull request #1360 from fusionpbx/revert-1355-Merge-4.0_BugFixes

Revert "cherry picked changes from 4.0 branch"
This commit is contained in:
FusionPBX 2016-01-04 13:14:04 -07:00
commit e766f8a20b
1 changed files with 5 additions and 14 deletions

View File

@ -156,20 +156,11 @@
file = voicemail_dir.."/"..id.."/msg_"..uuid.."."..vm_message_ext; file = voicemail_dir.."/"..id.."/msg_"..uuid.."."..vm_message_ext;
--send the email --send the email
if (voicemail_file == "attach") then send_mail(headers,
freeswitch.email(voicemail_mail_to,
voicemail_mail_to, voicemail_mail_to,
"To: "..voicemail_mail_to.."\nFrom: "..voicemail_mail_to.."\nX-Headers: "..headers.."\nSubject: "..subject, {subject, body},
body, (voicemail_file == "attach") and file
file
); );
else
freeswitch.email(voicemail_mail_to,
voicemail_mail_to,
"To: "..voicemail_mail_to.."\nFrom: "..voicemail_mail_to.."\nX-Headers: "..headers.."\nSubject: "..subject,
body
);
end
end end
--whether to keep the voicemail message and details local after email --whether to keep the voicemail message and details local after email