]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 234893 via svnmerge from
authorAlec L Davis <sivad.a@paradise.net.nz>
Tue, 15 Dec 2009 02:40:06 +0000 (02:40 +0000)
committerAlec L Davis <sivad.a@paradise.net.nz>
Tue, 15 Dec 2009 02:40:06 +0000 (02:40 +0000)
https://origsvn.digium.com/svn/asterisk/trunk

........
  r234893 | alecdavis | 2009-12-15 15:29:50 +1300 (Tue, 15 Dec 2009) | 9 lines

  fixes escape to extensions 'o' and 'a', for digits '0' and '*'

  (closes issue #16437)
  Reported by: alecdavis
  Tested by: alecdavis
  Patch
   extension_o_a_fix.diff.txt uploaded by alecdavis (license 585)
........

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

apps/app_directory.c

index f9abb3366904a699dd5cd8c66389c608a7e40ba1..9a891f7b2daf9d0876e312bc225a1df4b1740fbf 100644 (file)
@@ -673,11 +673,11 @@ static int do_directory(struct ast_channel *chan, struct ast_config *vmcfg, stru
        }
 
        if (digit == '0' && !goto_exten(chan, dialcontext, "o")) {
-               return 0;
+               return digit;
        }
 
        if (digit == '*' && !goto_exten(chan, dialcontext, "a")) {
-               return 0;
+               return digit;
        }
 
        ext[0] = digit;