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

diff --git a/main/pbx.c b/main/pbx.c
index b4f6599d9e9da6198118110535f9ca64f17978ea..59e4a3697ed8eb9452109c1752cd8089d7e31488 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -949,6 +949,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);