From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Fri, 4 Sep 2009 17:33:47 +0000 (+0000)
Subject: Merged revisions 216547 via svnmerge from
X-Git-Tag: 1.6.1.7-rc1~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c4f57d72f6c0518fcea4af6cb6099e7fcf7c201;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@216549 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

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 a2e3f7a9b1..a072c9a415 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -952,7 +952,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);