[svn-commits] mnicholson: trunk r253800 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Mon Mar 22 14:52:52 2010
New Revision: 253800

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=253800
Log:
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:
    trunk/   (props changed)
    trunk/main/features.c

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

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=253800&r1=253799&r2=253800
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Mon Mar 22 14:52:52 2010
@@ -3033,9 +3033,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) */