From b313b91b18b057dde37075b02c71c649f8d52354 Mon Sep 17 00:00:00 2001 From: tilghman Date: Fri, 12 Mar 2010 19:50:31 +0000 Subject: 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.1@251993 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_voicemail.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'apps') diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index c90086453..c6b07a3a5 100644 --- 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); -- cgit v1.2.3