[svn-commits] mnicholson: branch 1.8 r289179 - in /branches/1.8: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Wed Sep 29 10:04:56 2010
New Revision: 289179

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

................
  r289178 | mnicholson | 2010-09-29 10:04:11 -0500 (Wed, 29 Sep 2010) | 15 lines
  
  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.8/   (props changed)
    branches/1.8/main/channel.c

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

Modified: branches/1.8/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/channel.c?view=diff&rev=289179&r1=289178&r2=289179
==============================================================================
--- branches/1.8/main/channel.c (original)
+++ branches/1.8/main/channel.c Wed Sep 29 10:04:56 2010
@@ -6304,6 +6304,9 @@
 		ast_free(chan->caller.ani.number.str);
 		chan->caller.ani.number.str = ast_strdup(cid_ani);
 	}
+	if (chan->cdr) {
+		ast_cdr_setcid(chan->cdr, chan);
+	}
 
 	report_new_callerid(chan);