[asterisk-commits] tilghman: branch 1.6.0 r143406 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Sep 17 15:58:54 2008
New Revision: 143406

URL: http://svn.digium.com/view/asterisk?view=rev&rev=143406
Log:
Merged revisions 143405 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r143405 | tilghman | 2008-09-17 15:57:58 -0500 (Wed, 17 Sep 2008) | 13 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_voicemail.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

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