perform variable substitution earlier so it can be used for the cidmatch as well...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@5725 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 31a893f7c71fdd4c0ab1a62874dbf7aa83459049..378dd078ccdf7e5b8fb4a21bb5878baa9a996db2 100755 (executable)
--- 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);