[svn-commits] tilghman: branch 1.6.1 r162949 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Dec 10 17:13:22 2008
New Revision: 162949

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162949
Log:
Merged revisions 162922,162930 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r162922 | tilghman | 2008-12-10 16:48:09 -0600 (Wed, 10 Dec 2008) | 7 lines
  
  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
........
  r162930 | tilghman | 2008-12-10 17:01:14 -0600 (Wed, 10 Dec 2008) | 2 lines
  
  Previously missing line, now the substitution works correctly
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/pbx.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=162949&r1=162948&r2=162949
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Wed Dec 10 17:13:22 2008
@@ -6942,18 +6942,10 @@
 	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);
+		application = expand_buf;
 	}
 
 	length = sizeof(struct ast_exten);