aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorbbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-18 15:39:32 +0000
committerbbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b>2008-07-18 15:39:32 +0000
commita2c2a94844bad894bf40a6185d226a2476196a57 (patch)
tree0fbdc4e0385184e7cc3f98fae5ec1990368b78eb /main
parentcb94645753b4477cd2d259fb7b866a16196adc49 (diff)
Merged revisions 131916 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r131916 | bbryant | 2008-07-18 10:38:22 -0500 (Fri, 18 Jul 2008) | 12 lines Merged revisions 131915 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r131915 | bbryant | 2008-07-18 10:34:42 -0500 (Fri, 18 Jul 2008) | 4 lines Fix a bug in blind transfers where the BLINDTRANSFER variable isn't always set to the other end of the blind transfer. (closes issue #12586) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@131917 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r--main/features.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/features.c b/main/features.c
index 9b1fe278b..c6e741cca 100644
--- a/main/features.c
+++ b/main/features.c
@@ -936,8 +936,8 @@ static int builtin_blindtransfer(struct ast_channel *chan, struct ast_channel *p
}
/*! \todo XXX Maybe we should have another message here instead of invalid extension XXX */
} else if (ast_exists_extension(transferee, transferer_real_context, xferto, 1, transferer->cid.cid_num)) {
- pbx_builtin_setvar_helper(peer, "BLINDTRANSFER", transferee->name);
- pbx_builtin_setvar_helper(chan, "BLINDTRANSFER", peer->name);
+ pbx_builtin_setvar_helper(transferer, "BLINDTRANSFER", transferee->name);
+ pbx_builtin_setvar_helper(transferee, "BLINDTRANSFER", transferer->name);
res=finishup(transferee);
if (!transferer->cdr) {
transferer->cdr=ast_cdr_alloc();