[svn-commits] tilghman: branch 1.6.1 r251993 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Mar 12 13:50:31 2010
New Revision: 251993

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

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=251993&r1=251992&r2=251993
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Fri Mar 12 13:50:31 2010
@@ -6393,8 +6393,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);