[asterisk-commits] mnicholson: branch 1.6.1 r247654 - in /branches/1.6.1: ./ main/features.c

[SVN commits to the Asterisk project]

Author: mnicholson
Date: Thu Feb 18 13:45:23 2010
New Revision: 247654

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

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

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

Modified: branches/1.6.1/main/features.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/main/features.c?view=diff&rev=247654&r1=247653&r2=247654
==============================================================================
--- branches/1.6.1/main/features.c (original)
+++ branches/1.6.1/main/features.c Thu Feb 18 13:45:23 2010
@@ -2484,6 +2484,9 @@
 			ast_copy_string(bridge_cdr->lastdata, S_OR(chan->data, ""), sizeof(bridge_cdr->lastdata));
 			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 {