diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-24 17:07:29 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-24 17:07:29 +0000 |
commit | c130d270e9ab0e09c9823a0c4b3a809d1903c13b (patch) | |
tree | 123a5eef8b1a50932490c5e8156cd29651f57fdf /apps | |
parent | 14d3053cd1d89434a827e9d115324e57fc8aa60d (diff) |
Merged revisions 213833 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r213833 | jpeeler | 2009-08-24 11:43:57 -0500 (Mon, 24 Aug 2009) | 14 lines
Fix storage of greetings when using IMAP_STORAGE
Fix checking if the imapgreetings option is turned on to store the greeting
in IMAP.
(closes issue #14950)
Reported by: noahisaac
Patches:
14950.patch uploaded by mmichelson (license 60)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@213837 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_voicemail.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 0ed2a7349..2df46ff39 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1397,6 +1397,11 @@ static int imap_store_file(char *dir, char *mailboxuser, char *mailboxcontext, i void *buf; int tempcopy = 0; STRING str; + + /* Back out early if this is a greeting and we don't want to store greetings in IMAP */ + if (msgnum < 0 && !imapgreetings) { + return 0; + } /* Attach only the first format */ fmt = ast_strdupa(fmt); |