From 1945ad0aa37fd37cfbf8ecd73df3e9d7e4e3af55 Mon Sep 17 00:00:00 2001 From: Matthew Nicholson Date: Mon, 22 Mar 2010 19:55:08 +0000 Subject: [PATCH] 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.2@253801 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/features.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/main/features.c b/main/features.c index ecfd8eaf71..d075446bfe 100644 --- a/main/features.c +++ b/main/features.c @@ -2528,9 +2528,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) */ -- 2.47.2