From: Matthew Nicholson <mnicholson@digium.com>
Date: Mon, 22 Mar 2010 19:50:00 +0000 (+0000)
Subject: Unconditionally copy the caller's account code to the called party.
X-Git-Tag: 1.4.31-rc1~2^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=41d8051361e06eb6062424d0184dd0f7d5aa54ea;p=thirdparty%2Fasterisk.git

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.4@253799 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_features.c b/res/res_features.c
index 7bfd5b2468..7d53d185dc 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1788,9 +1788,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) */
 			bridge_cdr = ast_cdr_alloc(); /* this should be really, really rare/impossible? */