diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-22 19:57:11 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-22 19:57:11 +0000 |
| commit | 6c720223e8231630a8a653f0e399a407a29da18e (patch) | |
| tree | 989d4bf76f08e2ba62e19af8b7cef21f5d83a725 | |
| parent | a3e273b7bd4d80e3ff8ccfca8e1ed5a0cc813d55 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@253803 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/features.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/main/features.c b/main/features.c index 6e26fe7d9..cf8e84678 100644 --- a/main/features.c +++ b/main/features.c @@ -2277,9 +2277,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) */ |