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: https://origsvn.digium.com/svn/asterisk/branches/1.8@280672 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4b047badcd75511bda6c8fb086d6c171549a4a69..4ff67e3714fe9c2fe92e173c843363b2ae53da88 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -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));