From: Tilghman Lesher Date: Wed, 17 Sep 2008 20:57:58 +0000 (+0000) Subject: Merged revisions 143404 via svnmerge from X-Git-Tag: 1.6.2.0-beta1~1270 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43ba0b858bf65f7f00a7c5cb8b101bcebf613e9d;p=thirdparty%2Fasterisk.git Merged revisions 143404 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r143404 | tilghman | 2008-09-17 15:55:47 -0500 (Wed, 17 Sep 2008) | 6 lines When callerid is blank, we want to use "unknown caller" in those cases, too. (closes issue #13486) Reported by: tomo1657 Patches: 20080917__bug13486.diff.txt uploaded by Corydon76 (license 14) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@143405 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 90e0795b72..1e67996598 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3676,8 +3676,8 @@ static void prep_email_sub_vars(struct ast_channel *ast, struct ast_vm_user *vmu 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_CIDNAME", (cidname ? cidname : "an unknown caller")); - pbx_builtin_setvar_helper(ast, "VM_CIDNUM", (cidnum ? cidnum : "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); pbx_builtin_setvar_helper(ast, "VM_CATEGORY", category ? ast_strdupa(category) : "no category"); pbx_builtin_setvar_helper(ast, "VM_FLAG", flag);