[svn-commits] mnicholson: branch 1.6.1 r253802 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Mon Mar 22 14:56:36 2010
New Revision: 253802

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

................
  r253800 | mnicholson | 2010-03-22 14:52:52 -0500 (Mon, 22 Mar 2010) | 11 lines
  
  Merged revisions 253799 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r253799 | mnicholson | 2010-03-22 14:50:00 -0500 (Mon, 22 Mar 2010) | 4 lines
    
    Unconditionally copy the caller's account code to the called party.
    
    (related to issue #16331)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/features.c

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

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=253802&r1=253801&r2=253802
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Mon Mar 22 14:56:36 2010
@@ -2488,9 +2488,7 @@
 			if (peer_cdr && !ast_strlen_zero(peer_cdr->userfield)) {
 				ast_copy_string(bridge_cdr->userfield, peer_cdr->userfield, sizeof(bridge_cdr->userfield));
 			}
-			if (peer_cdr && ast_strlen_zero(peer->accountcode)) {
-				ast_cdr_setaccount(peer, chan->accountcode);
-			}
+			ast_cdr_setaccount(peer, chan->accountcode);
 
 		} else {
 			/* better yet, in a xfer situation, find out why the chan cdr got zapped (pun unintentional) */