diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 19:38:33 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 19:38:33 +0000 |
| commit | b48cbb3a1ebee0c062c355a226662980130d506b (patch) | |
| tree | 02b7317ecef2016034a5955ed13c680e87ecaee5 /apps/app_voicemail.c | |
| parent | a4b91f1101aca98b82d0ece0b98e15009c79a96e (diff) | |
When blank, callerid name and number should display "unknown caller" in voicemail
emails.
(Closes issue #13643)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@147997 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index da7b56923..362043513 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2932,7 +2932,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); |