diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-04 17:34:31 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-04 17:34:31 +0000 |
| commit | 2a2bedfdd928d0a1e400fe93b571867835c2dad7 (patch) | |
| tree | cfa2d56f214d6d622e7d74da5b5439a3098a2504 /main | |
| parent | 3268c67a568ee9cd396b4a2e0b2c86f5817a90b4 (diff) | |
Merged revisions 216547 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r216547 | tilghman | 2009-09-04 12:31:44 -0500 (Fri, 04 Sep 2009) | 3 lines
Enable turning off the application delimiter warning with the 'dontwarn' option.
Suggested on the -dev list, and implemented in an alternate way by me.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@216550 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index a0f4ca3b0..824788f88 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1340,7 +1340,7 @@ int pbx_exec(struct ast_channel *c, /*!< Channel */ if (app->module) u = __ast_module_user_add(app->module, c); if (strcasecmp(app->name, "system") && !ast_strlen_zero(data) && - strchr(data, '|') && !strchr(data, ',')) { + strchr(data, '|') && !strchr(data, ',') && !ast_opt_dont_warn) { 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); |