[svn-commits] mnicholson: branch 1.6.2 r289178 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Wed Sep 29 10:04:11 2010
New Revision: 289178

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=289178
Log:
Merged revisions 289177 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r289177 | mnicholson | 2010-09-29 10:03:27 -0500 (Wed, 29 Sep 2010) | 8 lines
  
  Set the caller id on CDRs when it is set on the parent channel.
  
  (closes issue #17569)
  Reported by: tbelder
  Patches:
        17569.diff uploaded by tbelder (license 618)
  Tested by: tbelder
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

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

Modified: branches/1.6.2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=289178&r1=289177&r2=289178
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Wed Sep 29 10:04:11 2010
@@ -4935,6 +4935,9 @@
 			ast_free(chan->cid.cid_ani);
 		chan->cid.cid_ani = ast_strdup(cid_ani);
 	}
+	if (chan->cdr) {
+		ast_cdr_setcid(chan->cdr, chan);
+	}
 
 	report_new_callerid(chan);