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.0@251992 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 506e93ffe1b0283cf4fb24ebb01ce1495eec4e65..6b6bfd75f53ad3a3549c107aa8a289e4cd03e92e 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -5661,8 +5661,6 @@ leave_vm_out:
 
                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);