mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-01 19:43:03 +00:00
perform variable substitution earlier so it can be used for the cidmatch as well (bug #4094)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5725 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1687,6 +1687,7 @@ static int pbx_load_module(void)
|
|||||||
else
|
else
|
||||||
data = "";
|
data = "";
|
||||||
}
|
}
|
||||||
|
pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext)-1);
|
||||||
cidmatch = strchr(ext, '/');
|
cidmatch = strchr(ext, '/');
|
||||||
if (cidmatch) {
|
if (cidmatch) {
|
||||||
*cidmatch = '\0';
|
*cidmatch = '\0';
|
||||||
@@ -1698,7 +1699,6 @@ static int pbx_load_module(void)
|
|||||||
if (!data)
|
if (!data)
|
||||||
data="";
|
data="";
|
||||||
while(*appl && (*appl < 33)) appl++;
|
while(*appl && (*appl < 33)) appl++;
|
||||||
pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext) - 1);
|
|
||||||
if (ipri) {
|
if (ipri) {
|
||||||
if (!strcmp(realext, "_."))
|
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);
|
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);
|
||||||
|
|||||||
Reference in New Issue
Block a user