[svn-commits] bbryant: branch 1.6.0 r131917 - in /branches/1.6.0: ./ main/features.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Fri Jul 18 10:39:32 2008
New Revision: 131917

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131917
Log:
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)

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/features.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/features.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/features.c?view=diff&rev=131917&r1=131916&r2=131917
==============================================================================
--- branches/1.6.0/main/features.c (original)
+++ branches/1.6.0/main/features.c Fri Jul 18 10:39:32 2008
@@ -936,8 +936,8 @@
 		}
 		/*! \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();