[asterisk-commits] tilghman: branch 1.8 r280672 - in /branches/1.8: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Aug  2 16:27:25 2010
New Revision: 280672

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280672
Log:
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
........

Modified:
    branches/1.8/   (props changed)
    branches/1.8/apps/app_voicemail.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Mon Aug  2 16:27:25 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671

Modified: branches/1.8/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/apps/app_voicemail.c?view=diff&rev=280672&r1=280671&r2=280672
==============================================================================
--- branches/1.8/apps/app_voicemail.c (original)
+++ branches/1.8/apps/app_voicemail.c Mon Aug  2 16:27:25 2010
@@ -11954,7 +11954,7 @@
 						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));