[asterisk-commits] wdoekes: trunk r357577 - in /trunk: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: wdoekes
Date: Wed Feb 29 13:48:33 2012
New Revision: 357577

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=357577
Log:
Fix copying of CDR(accountcode) to local channels.

In r203638, during the addition of the Channel Event Logging, in mid-2009, this
got broken in trunk and ended up in asterisk 1.8 and higher. This fixes so the
CDR(accountcode) from the calling channel is available to dialed channels again
as well as showing up properly in the CDR's.

(closes issue ASTERISK-19384)
Patches: accountcode.patch (License #6033) by jamicque
Review: https://reviewboard.asterisk.org/r/1775/
Reviewed by: Richard Mudgett
........

Merged revisions 357575 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 357576 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_dial.c?view=diff&rev=357577&r1=357576&r2=357577
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Wed Feb 29 13:48:33 2012
@@ -2313,10 +2313,11 @@
 		ast_channel_dialed(tc)->transit_network_select = ast_channel_dialed(chan)->transit_network_select;
 
 		if (!ast_strlen_zero(ast_channel_accountcode(chan))) {
-			ast_channel_peeraccount_set(tc, ast_channel_accountcode(chan));
-		}
-		if (ast_strlen_zero(ast_channel_musicclass(tc)))
+			ast_channel_accountcode_set(tc, ast_channel_accountcode(chan));
+		}
+		if (ast_strlen_zero(ast_channel_musicclass(tc))) {
 			ast_channel_musicclass_set(tc, ast_channel_musicclass(chan));
+		}
 
 		/* Pass ADSI CPE and transfer capability */
 		ast_channel_adsicpe_set(tc, ast_channel_adsicpe(chan));