[asterisk-commits] dvossel: branch 1.6.1 r192216 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon May  4 17:48:11 2009
New Revision: 192216

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=192216
Log:
Merged revisions 192214 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r192214 | dvossel | 2009-05-04 17:44:51 -0500 (Mon, 04 May 2009) | 17 lines
  
  Merged revisions 192213 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r192213 | dvossel | 2009-05-04 17:37:31 -0500 (Mon, 04 May 2009) | 11 lines
    
    global mohinterpret setting is ignored
    
    mohinterpret and mohsuggest global variables were not copied over during build_users and build_peers.
    
    (closes issue #14728)
    Reported by: dimas
    Patches:
          v1-14728.patch uploaded by dimas (license 88)
    Tested by: dimas, dvossel
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c

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

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=192216&r1=192215&r2=192216
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Mon May  4 17:48:11 2009
@@ -10646,6 +10646,8 @@
 			ast_clear_flag(peer, IAX_HASCALLERID);
 			ast_string_field_set(peer, cid_name, "");
 			ast_string_field_set(peer, cid_num, "");
+			ast_string_field_set(peer, mohinterpret, mohinterpret);
+			ast_string_field_set(peer, mohsuggest, mohsuggest);
 		}
 
 		if (!v) {
@@ -10890,6 +10892,9 @@
 			ast_clear_flag(user, IAX_HASCALLERID);
 			ast_string_field_set(user, cid_name, "");
 			ast_string_field_set(user, cid_num, "");
+			ast_string_field_set(user, accountcode, accountcode);
+			ast_string_field_set(user, mohinterpret, mohinterpret);
+			ast_string_field_set(user, mohsuggest, mohsuggest);
 		}
 		if (!v) {
 			v = alt;