Merged revisions 253799 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Mon, 22 Mar 2010 19:52:52 +0000 (19:52 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Mon, 22 Mar 2010 19:52:52 +0000 (19:52 +0000)
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)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@253800 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index 44daf37..012dcd3 100644 (file)
@@ -3033,9 +3033,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
                        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) */