[svn-commits] tilghman: trunk r251989 - /trunk/apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Mar 12 13:43:23 2010
New Revision: 251989

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=251989
Log:
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

Modified:
    trunk/apps/app_voicemail.c

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=251989&r1=251988&r2=251989
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Fri Mar 12 13:43:23 2010
@@ -6686,8 +6686,6 @@
 
 	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);