aboutsummaryrefslogtreecommitdiffstats
path: root/pbx
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2005-05-19 02:51:00 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2005-05-19 02:51:00 +0000
commit738afcf821095f415ba568df146fd63d3cfd7e38 (patch)
tree453d884dba718477835422cc70cc9968f849cfed /pbx
parentcfc872f3755366ef9c81ea64c0f7114a17866e8a (diff)
perform variable substitution earlier so it can be used for the cidmatch as well (bug #4094)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-0@5725 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rwxr-xr-xpbx/pbx_config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 31a893f7c..378dd078c 100755
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1687,6 +1687,7 @@ static int pbx_load_module(void)
else
data = "";
}
+ pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext)-1);
cidmatch = strchr(ext, '/');
if (cidmatch) {
*cidmatch = '\0';
@@ -1698,7 +1699,6 @@ static int pbx_load_module(void)
if (!data)
data="";
while(*appl && (*appl < 33)) appl++;
- pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext) - 1);
if (ipri) {
if (!strcmp(realext, "_."))
ast_log(LOG_WARNING, "The use of '_.' for an extension is strongly discouraged and can have unexpected behavior. Please use '_X.' instead at line %d\n", v->lineno);