Merged revisions 190726 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r190726 | tilghman | 2009-04-27 14:34:48 -0500 (Mon, 27 Apr 2009) | 4 lines

  Don't warn on pipe in the System call.
  (closes issue #14979)
   Reported by: pj
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@190728 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index bbf41ffb776e9e24bebb4c855d85b3f687717a87..40a083d6b824e3187b142866931619d36004f49e 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -949,7 +949,8 @@ 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, ',')) {
+       if (strcasecmp(app->name, "system") && !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);