summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorMatthew Nicholson <mnicholson@digium.com>2010-03-22 19:52:52 +0000
committerMatthew Nicholson <mnicholson@digium.com>2010-03-22 19:52:52 +0000
commit8acef966ef835ecb7e7c1f55e08b8c062a78bd94 (patch)
treee0f2bde956943822ef2d3ab1af4340bdb92d3df6 /main
parentfdef7e5deb55028d4361814dac02b95568f1fae3 (diff)
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/trunk@253800 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/features.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/main/features.c b/main/features.c
index 44daf3779..012dcd355 100644
--- a/main/features.c
+++ b/main/features.c
@@ -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) */