mirror of
https://github.com/asterisk/asterisk.git
synced 2026-06-30 20:19:42 -07:00
Merged revisions 147997 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r147997 | tilghman | 2008-10-09 14:38:33 -0500 (Thu, 09 Oct 2008) | 4 lines When blank, callerid name and number should display "unknown caller" in voicemail emails. (Closes issue #13643) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@148000 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -3677,7 +3677,8 @@ static void prep_email_sub_vars(struct ast_channel *ast, struct ast_vm_user *vmu
|
||||
pbx_builtin_setvar_helper(ast, "VM_MSGNUM", passdata);
|
||||
pbx_builtin_setvar_helper(ast, "VM_CONTEXT", context);
|
||||
pbx_builtin_setvar_helper(ast, "VM_MAILBOX", mailbox);
|
||||
pbx_builtin_setvar_helper(ast, "VM_CALLERID", ast_callerid_merge(callerid, sizeof(callerid), cidname, cidnum, "Unknown Caller"));
|
||||
pbx_builtin_setvar_helper(ast, "VM_CALLERID", (!ast_strlen_zero(cidname) || !ast_strlen_zero(cidnum)) ?
|
||||
ast_callerid_merge(callerid, sizeof(callerid), cidname, cidnum, NULL) : "an unknown caller");
|
||||
pbx_builtin_setvar_helper(ast, "VM_CIDNAME", (!ast_strlen_zero(cidname) ? cidname : "an unknown caller"));
|
||||
pbx_builtin_setvar_helper(ast, "VM_CIDNUM", (!ast_strlen_zero(cidnum) ? cidnum : "an unknown caller"));
|
||||
pbx_builtin_setvar_helper(ast, "VM_DATE", date);
|
||||
|
||||
Reference in New Issue
Block a user