diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-12 19:50:57 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-12 19:50:57 +0000 |
| commit | b9c13d73c57d4452f54bb3d1f30ad4af83560d10 (patch) | |
| tree | 71d2b28673b6eb6cb485db30cfedb43161b98e36 /apps/app_voicemail.c | |
| parent | be3d372c96861b70a2bab91ee3b9d3d28a774aa2 (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.2@251994 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -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 1897c9c82..c035aa9d1 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -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); |