aboutsummaryrefslogtreecommitdiffstats
path: root/main/pbx.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-14 05:45:55 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-14 05:45:55 +0000
commit8d2ad48d0b5364200d833e32c2af4925ae8d0bca (patch)
tree869a5998546ae7649f67d95bbb8f05a1a988fd2e /main/pbx.c
parent7fac29f6c135e45ea4d1773933521415fdea593d (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.0@188211 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
-rw-r--r--main/pbx.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 5e897da66..da48d9e1a 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -939,6 +939,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);