From ad69df830d5454f971ba7c7ba1c477066731d4bd Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 4 Sep 2009 17:31:44 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@216547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
UPGRADE-1.6.txt | 6 ++++++
main/pbx.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/UPGRADE-1.6.txt b/UPGRADE-1.6.txt
index c6ed5404b2..9d09ab0022 100644
--- a/UPGRADE-1.6.txt
+++ b/UPGRADE-1.6.txt
@@ -71,6 +71,12 @@ Core:
You now only need to quote strings in configuration files if you literally
want quotation marks within a string.
+* Any applications run that contain the pipe symbol but not a comma symbol will
+ get a warning printed to the effect that the application delimiter has changed.
+ However, there are legitimate reasons why this might be useful in certain
+ situations, so this warning can be turned off with the dontwarn option in
+ asterisk.conf.
+
* The logger.conf option 'rotatetimestamp' has been deprecated in favor of
'rotatestrategy'. This new option supports a 'rotate' strategy that more
closely mimics the system logger in terms of file rotation.
diff --git a/main/pbx.c b/main/pbx.c
index 9aa3b31db9..d8b7ff33c8 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -1361,7 +1361,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);
--
GitLab