Merged revisions 112357 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r112357 | murf | 2008-04-01 16:45:10 -0600 (Tue, 01 Apr 2008) | 1 line

Bumped across another test set for the new exten pattern matcher, which revealed a problem with the CANMATCH/MATCHMORE modes. Direct matches were getting in the way. Fixed.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@112359 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/pbx.c

@@ -1010,9 +1010,11 @@ static void new_find_extension(const char *str, struct scoreboard *score, struct
 			if (p->x[1] == 0 && *str >= '2' && *str <= '9' ) {
 #define NEW_MATCHER_CHK_MATCH	       \
 				if (p->exten && !(*(str+1))) { /* if a shorter pattern matches along the way, might as well report it */ \
-					update_scoreboard(score, length+1, spec+p->specificity, p->exten,0,callerid, p->deleted, p);         \
-					if (!p->deleted)                                                                                     \
-						return; /* the first match, by definition, will be the best, because of the sorted tree */       \
+					if (action == E_MATCH) { /* if in CANMATCH/MATCHMORE, don't let matches get in the way */            \
+						update_scoreboard(score, length+1, spec+p->specificity, p->exten,0,callerid, p->deleted, p);     \
+						if (!p->deleted)								                                                 \
+							return; /* the first match, by definition, will be the best, because of the sorted tree */   \
+					}                                                                                                    \
 				}
 				
 #define NEW_MATCHER_RECURSE	           \