Merged revisions 251989 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r251989 | tilghman | 2010-03-12 13:43:23 -0600 (Fri, 12 Mar 2010) | 8 lines

  Don't override a user option with the global option.

  (closes issue #16849)
   Reported by: ip-rob
   Patches:
         20100311__issue16849.diff.txt uploaded by tilghman (license 14)
   Tested by: ip-rob
........

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

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index c9008645327e72b56dda805967954fe34519e48c..c6b07a3a51b5b11e67efbcd122d883d7b25badb5 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6393,8 +6393,6 @@ static int notify_new_message(struct ast_channel *chan, struct ast_vm_user *vmu,
 
        if (!ast_strlen_zero(vmu->email)) {
                int attach_user_voicemail = ast_test_flag(vmu, 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);