diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-14 05:47:06 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-14 05:47:06 +0000 |
| commit | a79c86fae0ef6b25334432595aac0909345df0ac (patch) | |
| tree | 2f6c1c2d07532899d6c67a0f3c2f94e95ef4a235 /main | |
| parent | 4a97654879c5f2c34b702758f850f2bfa069a993 (diff) | |
Merged revisions 188210 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r188210 | tilghman | 2009-04-14 00:45:13 -0500 (Tue, 14 Apr 2009) | 2 lines
As suggested by Russell, warn users when their dialplan arguments contain pipes, but not commas.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@188213 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c index f60801d4f..2cebad8b2 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1339,6 +1339,11 @@ int pbx_exec(struct ast_channel *c, /*!< Channel */ c->data = data; if (app->module) u = __ast_module_user_add(app->module, c); + if (!ast_strlen_zero(data) && strchr(data, '|') && !strchr(data, ',')) { + ast_log(LOG_WARNING, "The application delimiter is now the comma, not " + "the pipe. Did you forget to convert your dialplan? (%s(%s))\n", + app->name, (char *) data); + } res = app->execute(c, S_OR(data, "")); if (app->module && u) __ast_module_user_remove(app->module, u); |