From 399397bd799998bbd53aa621ca8029f5ad7d84ae Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 23 Aug 2017 14:14:45 -0400 Subject: [PATCH] Only discard mails if vacation conditions match Fixes #4245 --- SoObjects/SOGo/SOGoSieveManager.m | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SoObjects/SOGo/SOGoSieveManager.m b/SoObjects/SOGo/SOGoSieveManager.m index aa018fd4e..70d705b43 100644 --- a/SoObjects/SOGo/SOGoSieveManager.m +++ b/SoObjects/SOGo/SOGoSieveManager.m @@ -961,14 +961,14 @@ static NSString *sieveScriptName = @"sogo"; [vacation_script appendFormat: @"text:\r\n%@\r\n.\r\n;\r\n", text]; - // Closing bracket of conditions - if ([allConditions count]) - [vacation_script appendString: @"}\r\n"]; - // Should we discard incoming mails during vacation? if (discardMails) [vacation_script appendString: @"discard;\r\n"]; + // Closing bracket of conditions + if ([allConditions count]) + [vacation_script appendString: @"}\r\n"]; + // // See https://sogo.nu/bugs/view.php?id=2332 for details //