[svn-commits] tilghman: trunk r162922 - /trunk/main/pbx.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec 10 16:48:09 2008
New Revision: 162922

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162922
Log:
Checking global variables here actually overwrote the previous substitution by
channel variables, and in any case, was redundant;
pbx_substitute_variables_helper ALREADY does substitution for global
variables.
(closes issue #13327)
 Reported by: pj

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=162922&r1=162921&r2=162922
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Dec 10 16:48:09 2008
@@ -7464,18 +7464,9 @@
 	if (priority == PRIORITY_HINT && strstr(application, "${") && !strstr(extension, "_")) {
 		struct ast_channel c = {0, };
 
-		/* Start out with regular variables */
 		ast_copy_string(c.exten, extension, sizeof(c.exten));
 		ast_copy_string(c.context, con->name, sizeof(c.context));
 		pbx_substitute_variables_helper(&c, application, expand_buf, sizeof(expand_buf));
-
-		/* Move on to global variables if they exist */
-		ast_rwlock_rdlock(&globalslock);
-		if (AST_LIST_FIRST(&globals)) {
-			pbx_substitute_variables_varshead(&globals, application, expand_buf, sizeof(expand_buf));
-			application = expand_buf;
-		}
-		ast_rwlock_unlock(&globalslock);
 	}
 
 	length = sizeof(struct ast_exten);