[svn-commits] tilghman: trunk r143405 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Sep 17 15:57:58 2008
New Revision: 143405

URL: http://svn.digium.com/view/asterisk?view=rev&rev=143405
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=143405&r1=143404&r2=143405
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Wed Sep 17 15:57:58 2008
@@ -3676,8 +3676,8 @@
 	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);