[asterisk-commits] trunk - r7383 in /trunk: ./ pbx.c

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Dec  7 14:47:59 2005
New Revision: 7383

URL: http://svn.digium.com/view/asterisk?rev=7383&view=rev
Log:
Merged revisions 7382 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7382 | kpfleming | 2005-12-07 14:46:55 -0600 (Wed, 07 Dec 2005) | 2 lines

ensure that hints are allowed to use global variable references

........

Modified:
    trunk/   (props changed)
    trunk/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec  7 14:47:59 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-7351
+/branches/1.2:1-7382

Modified: trunk/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx.c?rev=7383&r1=7382&r2=7383&view=diff
==============================================================================
--- trunk/pbx.c (original)
+++ trunk/pbx.c Wed Dec  7 14:47:59 2005
@@ -4614,6 +4614,16 @@
 	int res;
 	int length;
 	char *p;
+	char expand_buf[VAR_BUF_SIZE];
+
+	/* if we are adding a hint, and there are global variables, and the hint
+	   contains variable references, then expand them
+	*/
+	if ((priority == PRIORITY_HINT) && AST_LIST_FIRST(&globals) && strstr(application, "${")) {
+		pbx_substitute_variables_varshead(&globals, application, expand_buf, sizeof(expand_buf));
+		application = expand_buf;
+	}
+
 	length = sizeof(struct ast_exten);
 	length += strlen(extension) + 1;
 	length += strlen(application) + 1;