[asterisk-commits] tilghman: branch 1.6.1 r218054 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Sep 11 00:59:49 2009
New Revision: 218054

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=218054
Log:
Merged revisions 218050 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r218050 | tilghman | 2009-09-11 00:58:11 -0500 (Fri, 11 Sep 2009) | 3 lines
  
  Check the origination priority for more matches, not the current priority.
  Found by Pavel Troller on the -dev list.
........

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.asterisk.org/svn-view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=218054&r1=218053&r2=218054
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Fri Sep 11 00:59:49 2009
@@ -3776,7 +3776,7 @@
 				ast_verb(2, "Spawn extension (%s, %s, %d) exited INCOMPLETE on '%s'\n", c->context, c->exten, c->priority, c->name);
 
 				/* Don't cycle on incomplete - this will happen if the only extension that matches is our "incomplete" extension */
-				if (!ast_matchmore_extension(c, c->context, c->exten, c->priority, c->cid.cid_num)) {
+				if (!ast_matchmore_extension(c, c->context, c->exten, 1, c->cid.cid_num)) {
 					invalid = 1;
 				} else {
 					ast_copy_string(dst_exten, c->exten, sizeof(dst_exten));