From: Matthew Nicholson <mnicholson@digium.com>
Date: Mon, 22 Mar 2010 19:56:36 +0000 (+0000)
Subject: Merged revisions 253800 via svnmerge from
X-Git-Tag: 1.6.1.19-rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05dfa94a20f20492ba39301cc778538f42f5f652;p=thirdparty%2Fasterisk.git

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)
  ........
................


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

diff --git a/main/features.c b/main/features.c
index e67e2cd94e..790418b747 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2488,9 +2488,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) */