diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-12 19:49:02 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-12 19:49:02 +0000 |
| commit | 4649567d2c6ba3cd2cfbb028f03b11f35b87763c (patch) | |
| tree | d4e6ca10e6c3a36ce6053c5d22d1fce5bbf30e33 /apps | |
| parent | 194e739ffe760e89c0b725b217e71ee0f720cdbf (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@251992 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_voicemail.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 506e93ffe..6b6bfd75f 100644 --- 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); |