[svn-commits] tilghman: branch 1.6.0 r194139 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue May 12 19:54:07 2009
New Revision: 194139

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

................
  r194138 | tilghman | 2009-05-12 19:52:49 -0500 (Tue, 12 May 2009) | 14 lines
  
  Merged revisions 194137 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r194137 | tilghman | 2009-05-12 19:52:03 -0500 (Tue, 12 May 2009) | 7 lines
    
    Fix logic for how to proceed with a single digit extension.
    (closes issue #15091)
     Reported by: andrew
     Patches: 
           20090512__issue15091.diff.txt uploaded by tilghman (license 14)
     Tested by: andrew
  ........
................

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

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

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=194139&r1=194138&r2=194139
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Tue May 12 19:54:07 2009
@@ -7960,7 +7960,7 @@
 	 * gone immediately to the "i" extension, but will now need to wait for a
 	 * timeout.
 	 */
-	if ((exten[0] = res) && (ast_exists_extension(chan, args.context, exten, 1, chan->cid.cid_num) || !ast_matchmore_extension(chan, args.context, exten, 1, chan->cid.cid_num))) {
+	if ((exten[0] = res) && !ast_matchmore_extension(chan, args.context, exten, 1, chan->cid.cid_num)) {
 		snprintf(chan->exten, sizeof(chan->exten), "%c", res);
 		ast_copy_string(chan->context, args.context, sizeof(chan->context));
 		chan->priority = 0;