diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-12-10 22:48:09 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2008-12-10 22:48:09 +0000 |
| commit | 689465ba98b74bfb646d5bbf2821228da14bdab4 (patch) | |
| tree | 94dfabb3e848698bb19dd1094d63aeae419da77f /main/pbx.c | |
| parent | 040e552c26e7d1d8a49fd3a122d6ba9aec5f8d92 (diff) | |
Checking global variables here actually overwrote the previous substitution by
channel variables, and in any case, was redundant;
pbx_substitute_variables_helper ALREADY does substitution for global
variables.
(closes issue #13327)
Reported by: pj
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@162922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/main/pbx.c b/main/pbx.c index 79ea30edd..5fe9311f4 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -7464,18 +7464,9 @@ int ast_add_extension2(struct ast_context *con, if (priority == PRIORITY_HINT && strstr(application, "${") && !strstr(extension, "_")) { struct ast_channel c = {0, }; - /* Start out with regular variables */ ast_copy_string(c.exten, extension, sizeof(c.exten)); ast_copy_string(c.context, con->name, sizeof(c.context)); pbx_substitute_variables_helper(&c, application, expand_buf, sizeof(expand_buf)); - - /* Move on to global variables if they exist */ - ast_rwlock_rdlock(&globalslock); - if (AST_LIST_FIRST(&globals)) { - pbx_substitute_variables_varshead(&globals, application, expand_buf, sizeof(expand_buf)); - application = expand_buf; - } - ast_rwlock_unlock(&globalslock); } length = sizeof(struct ast_exten); |