diff options
| -rw-r--r-- | UPGRADE.txt | 4 | ||||
| -rw-r--r-- | main/pbx.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/UPGRADE.txt b/UPGRADE.txt index b54e3f0af..c5b752a30 100644 --- a/UPGRADE.txt +++ b/UPGRADE.txt @@ -130,7 +130,9 @@ Applications: interpolation falling back to globals when no channel variable is set. * The application SetVar has been renamed to Set. The syntax SetVar was marked - deprecated in version 1.2 and is no longer recognized in this version. + deprecated in version 1.2 and is no longer recognized in this version. The + use of Set with multiple argument pairs has also been deprecated. Please + separate each name/value pair into its own dialplan line. * app_read has been updated to use the newer options codes, using "skip" or "noanswer" will not work. Use s or n. Also there is a new feature i, for diff --git a/main/pbx.c b/main/pbx.c index 11b614583..f3dcea8c7 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -5857,10 +5857,15 @@ int pbx_builtin_setvar(struct ast_channel *chan, void *data) /* check for a trailing flags argument */ if ((argc > 1) && !strchr(argv[argc-1], '=')) { argc--; - if (strchr(argv[argc], 'g')) + if (strchr(argv[argc], 'g')) { + ast_log(LOG_WARNING, "The use of the 'g' flag is deprecated. Please use Set(GLOBAL(foo)=bar) instead\n"); global = 1; + } } + if (argc > 1) + ast_log(LOG_WARNING, "Setting multiple variables at once within Set is deprecated. Please separate each name/value pair into its own line.\n"); + for (x = 0; x < argc; x++) { name = argv[x]; if ((value = strchr(name, '='))) { |