aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-18 19:41:55 +0000
committermnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b>2010-02-18 19:41:55 +0000
commitf02a12689cd1d5bdf6ca39bb8c9bd7bdd093cc43 (patch)
treedf44ba973d2884ce3ca6ed7dbd687d971111bebd
parent9b902a29357499f2a644b8b83a497ff2d7201207 (diff)
Merged revisions 247652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r247652 | mnicholson | 2010-02-18 13:39:37 -0600 (Thu, 18 Feb 2010) | 13 lines Merged revisions 247651 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r247651 | mnicholson | 2010-02-18 13:38:09 -0600 (Thu, 18 Feb 2010) | 6 lines Copy the calling party's account code to the called party if they don't already have one. (closes issue #16331) Reported by: bluefox Tested by: mnicholson ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@247653 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/features.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/features.c b/main/features.c
index be3d0692d..8c8d9bbed 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2522,6 +2522,9 @@ 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);
+ }
} else {
/* better yet, in a xfer situation, find out why the chan cdr got zapped (pun unintentional) */