[svn-commits] tilghman: branch 1.6.0 r188211 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Apr 14 00:45:55 2009
New Revision: 188211

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=188211
Log:
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.
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=188211&r1=188210&r2=188211
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Tue Apr 14 00:45:55 2009
@@ -939,6 +939,11 @@
 	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);