diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-10 16:31:31 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-10 16:31:31 +0000 |
commit | ec24a1e5575f6a1f7fc87c120c7e5c57a45636ce (patch) | |
tree | 0f53c5e23091a05d5b427442fc6e66ecdf36b6c4 /apps/app_voicemail.c | |
parent | 246755e0d449975c531907d2ea979fdf9d71069c (diff) |
Merged revisions 148257 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r148257 | tilghman | 2008-10-10 11:25:31 -0500 (Fri, 10 Oct 2008) | 7 lines
User not notified of temporary greeting, if ODBC storage is in use.
(closes issue #13659)
Reported by: moliveras
Patches:
20081009__bug13659.diff.txt uploaded by Corydon76 (license 14)
Tested by: moliveras
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@148268 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
-rw-r--r-- | apps/app_voicemail.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 58400595a..4134f19bf 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -7756,8 +7756,11 @@ static int vm_intro(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm /* Notify the user that the temp greeting is set and give them the option to remove it */ snprintf(prefile, sizeof(prefile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, vms->username); if (ast_test_flag(vmu, VM_TEMPGREETWARN)) { - if (ast_fileexists(prefile, NULL, NULL) > 0) + RETRIEVE(prefile, -1, vmu->mailbox, vmu->context); + if (ast_fileexists(prefile, NULL, NULL) > 0) { ast_play_and_wait(chan, "vm-tempgreetactive"); + } + DISPOSE(prefile, -1); } /* Play voicemail intro - syntax is different for different languages */ @@ -8095,9 +8098,11 @@ static int vm_options(struct ast_channel *chan, struct ast_vm_user *vmu, struct default: cmd = 0; snprintf(prefile, sizeof(prefile), "%s%s/%s/temp", VM_SPOOL_DIR, vmu->context, vms->username); + RETRIEVE(prefile, -1, vmu->mailbox, vmu->context); if (ast_fileexists(prefile, NULL, NULL)) { cmd = ast_play_and_wait(chan, "vm-tmpexists"); } + DISPOSE(prefile, -1); if (!cmd) { cmd = ast_play_and_wait(chan, "vm-options"); } |