[Asterisk-cvs] asterisk/pbx pbx_config.c,1.45.2.1,1.45.2.2

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/pbx
In directory mongoose.digium.com:/tmp/cvs-serv9514/pbx

Modified Files:
      Tag: v1-0
	pbx_config.c 
Log Message:
perform variable substitution earlier so it can be used for the cidmatch as well (bug #4094)


Index: pbx_config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_config.c,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -u -d -r1.45.2.1 -r1.45.2.2
--- pbx_config.c	15 Apr 2005 06:44:35 -0000	1.45.2.1
+++ pbx_config.c	19 May 2005 02:51:00 -0000	1.45.2.2
@@ -1687,6 +1687,7 @@
 								else
 									data = "";
 							}
+							pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext)-1);	
 							cidmatch = strchr(ext, '/');
 							if (cidmatch) {
 								*cidmatch = '\0';
@@ -1698,7 +1699,6 @@
 							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);