[asterisk-commits] tilghman: trunk r280673 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Aug  2 16:28:09 2010
New Revision: 280673

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=280673&r1=280672&r2=280673
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon Aug  2 16:28:09 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));