From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 2 Aug 2010 21:28:09 +0000 (+0000)
Subject: Merged revisions 280672 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2506
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18dee4d9960e2676bc1eb63e48c4ea2b5c170e6f;p=thirdparty%2Fasterisk.git

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 4b047badcd..4ff67e3714 100644
--- 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));