mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-05 03:40:18 +00:00
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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@192215 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -10586,6 +10586,8 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, st
|
||||
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) {
|
||||
@@ -10830,6 +10832,9 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, st
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user