diff options
| author | Matthew Nicholson <mnicholson@digium.com> | 2011-07-12 20:08:04 +0000 |
|---|---|---|
| committer | Matthew Nicholson <mnicholson@digium.com> | 2011-07-12 20:08:04 +0000 |
| commit | ae3d614ab80b003a93c48defc0833aa8bb012810 (patch) | |
| tree | dbe71c176c44a87d212ae496381b490aea6ecfe0 /apps/app_directory.c | |
| parent | 881d139b84eb7f7627db150c0c58c7e69e9e1b31 (diff) | |
Merged revisions 327890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r327890 | mnicholson | 2011-07-12 15:07:20 -0500 (Tue, 12 Jul 2011) | 2 lines
search in the current context for 'a' and 'o' instead of 'default'
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@327891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_directory.c')
| -rw-r--r-- | apps/app_directory.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/app_directory.c b/apps/app_directory.c index 305bcdd7b..8451eea08 100644 --- a/apps/app_directory.c +++ b/apps/app_directory.c @@ -57,7 +57,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") <parameter name="dial-context" required="false"> <para>This is the dialplan context to use when looking for an extension that the user has selected, or when jumping to the - <literal>o</literal> or <literal>a</literal> extension.</para> + <literal>o</literal> or <literal>a</literal> extension. If not + specified, the current context will be used.</para> </parameter> <parameter name="options" required="false"> <optionlist> @@ -246,7 +247,7 @@ static int compare(const char *text, const char *template) static int goto_exten(struct ast_channel *chan, const char *dialcontext, char *ext) { - if (!ast_goto_if_exists(chan, dialcontext, ext, 1) || + if (!ast_goto_if_exists(chan, S_OR(dialcontext, chan->context), ext, 1) || (!ast_strlen_zero(chan->macrocontext) && !ast_goto_if_exists(chan, chan->macrocontext, ext, 1))) { return 0; @@ -685,11 +686,11 @@ static int do_directory(struct ast_channel *chan, struct ast_config *vmcfg, stru int count, i; char ext[10] = ""; - if (digit == '0' && !goto_exten(chan, S_OR(dialcontext, "default"), "o")) { + if (digit == '0' && !goto_exten(chan, dialcontext, "o")) { return digit; } - if (digit == '*' && !goto_exten(chan, S_OR(dialcontext, "default"), "a")) { + if (digit == '*' && !goto_exten(chan, dialcontext, "a")) { return digit; } |