diff options
| author | Russell Bryant <russell@russellbryant.com> | 2006-02-16 18:19:05 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2006-02-16 18:19:05 +0000 |
| commit | 39fbbe1c256f45f246fc6009119cf42e250480eb (patch) | |
| tree | 984cfd2928794db48c8a61c99515109c74c0af7c /apps | |
| parent | 118b277ab1356cfff943bbe3197dd8ab001cd9f8 (diff) | |
Merged revisions 10301 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r10301 | russell | 2006-02-16 13:07:52 -0500 (Thu, 16 Feb 2006) | 3 lines
when executing the Directory application from voicemail and a context is not
specified, use the "default" context, not the channel's current context (issue #6507)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@10302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 28bd9a85d..aebefeee9 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3403,7 +3403,7 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i break; } - if( use_directory ) { + if (use_directory) { /* use app_directory */ char old_context[sizeof(chan->context)]; @@ -3420,7 +3420,7 @@ static int forward_message(struct ast_channel *chan, char *context, char *dir, i old_priority = chan->priority; /* call the the Directory, changes the channel */ - res = pbx_exec(chan, app, ((context)?context:chan->context), 1); + res = pbx_exec(chan, app, context ? context : "default", 1); ast_copy_string(username, chan->exten, sizeof(username)); |