Merged revisions 280672 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r280672 | tilghman | 2010-08-02 16:27:25 -0500 (Mon, 02 Aug 2010) | 9 lines Merged revisions 280671 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r280671 | tilghman | 2010-08-02 16:26:11 -0500 (Mon, 02 Aug 2010) | 2 lines Allow the pipe, but also allow the comma ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@280673 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
af3013ef3d
commit
4cf7ae4b30
|
@ -11954,7 +11954,7 @@ static int load_config(int reload)
|
|||
if ((z = ast_malloc(sizeof(*z)))) {
|
||||
char *msg_format, *tzone;
|
||||
msg_format = ast_strdupa(var->value);
|
||||
tzone = strsep(&msg_format, "|");
|
||||
tzone = strsep(&msg_format, "|,");
|
||||
if (msg_format) {
|
||||
ast_copy_string(z->name, var->name, sizeof(z->name));
|
||||
ast_copy_string(z->timezone, tzone, sizeof(z->timezone));
|
||||
|
|
Reference in New Issue