[asterisk-commits] file: trunk r38235 - in /trunk: ./ channels/chan_sip.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Jul 26 10:27:45 2006
New Revision: 38235

URL: http://svn.digium.com/view/asterisk?rev=38235&view=rev
Log:
Merged revisions 38234 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38234 | file | 2006-07-26 11:26:06 -0400 (Wed, 26 Jul 2006) | 2 lines

Put default callerid into contact when the one specified is either NULL or has a zero string length. (issue #7590 reported by key2)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=38235&r1=38234&r2=38235&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jul 26 10:27:45 2006
@@ -6286,7 +6286,7 @@
 		l = CALLERID_UNKNOWN;
 		n = l;
 	}
-	if (!l)
+	if (ast_strlen_zero(l))
 		l = default_callerid;
 	if (ast_strlen_zero(n))
 		n = l;