]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merged revisions 251989 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Fri, 12 Mar 2010 19:50:57 +0000 (19:50 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Fri, 12 Mar 2010 19:50:57 +0000 (19:50 +0000)
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.2@251994 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index 1897c9c822ccb5eed35d718e7dc900e3a6363a00..c035aa9d1809a56fec781ed6cbfc4dc93da8c2af 100644 (file)
@@ -6513,8 +6513,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);