Merged revisions 78101 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r78101 | russell | 2007-08-03 15:14:06 -0500 (Fri, 03 Aug 2007) | 10 lines

(closes issue #10194)
Reported by: blitzrage
Patches:
      bug0010194 uploaded by vovochka
Tested by: blitzrage

Fix a problem when you call Voicemail() with multiple mailboxes specified and
ODBC_STORAGE is in use.  The audio part of the message was only given to the
first mailbox specified.

........

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 1756202..7f2145e 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4154,8 +4154,14 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu,
                if (!attach_user_voicemail)
                        attach_user_voicemail = ast_test_flag((&globalflags), VM_ATTACH);
 
                if (!attach_user_voicemail)
                        attach_user_voicemail = ast_test_flag((&globalflags), VM_ATTACH);
 

+               if (attach_user_voicemail)
+                       RETRIEVE(todir, msgnum, vmu->mailbox, vmu->context);
+

                /*XXX possible imap issue, should category be NULL XXX*/
                sendmail(myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, fn, fmt, duration, attach_user_voicemail, chan, category);
                /*XXX possible imap issue, should category be NULL XXX*/
                sendmail(myserveremail, vmu, msgnum, vmu->context, vmu->mailbox, cidnum, cidname, fn, fmt, duration, attach_user_voicemail, chan, category);

+
+               if (attach_user_voicemail)
+                       DISPOSE(todir, msgnum);

        }
 
        if (!ast_strlen_zero(vmu->pager))
        }
 
        if (!ast_strlen_zero(vmu->pager))