Merge the dialplan_aesthetics branch. Most of this patch simply converts applications
[asterisk/asterisk.git] / funcs / func_callerid.c
index 462f887..f218c8e 100644 (file)
@@ -63,10 +63,10 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
        if (!chan)
                return -1;
 
        if (!chan)
                return -1;
 
-       if (strchr(opt, '|')) {
+       if (strchr(opt, ',')) {
                char name[80], num[80];
 
                char name[80], num[80];
 
-               data = strsep(&opt, "|");
+               data = strsep(&opt, ",");
                ast_callerid_split(opt, name, sizeof(name), num, sizeof(num));
 
                if (!strncasecmp("all", data, 3)) {
                ast_callerid_split(opt, name, sizeof(name), num, sizeof(num));
 
                if (!strncasecmp("all", data, 3)) {