amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-01 01:39:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix for bug #2492

Browse Source
This commit is contained in:
Ludovic Marcotte
2014-05-02 13:35:21 -04:00
parent 0b9afec635
commit 7d7961ffcf
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -23,6 +23,7 @@ Bug fixes
- fixed display of events having a category with HTML entities (#2703) - fixed display of events having a category with HTML entities (#2703)
- fixed display of images in CSS background (#2437) - fixed display of images in CSS background (#2437)
- fixed limitation of Sieve script size (#2745) - fixed limitation of Sieve script size (#2745)
- fixed sync-token generation when no change was returned (#2492)
2.2.3 (2014-04-03) 2.2.3 (2014-04-03)
------------------ ------------------

12
SoObjects/SOGo/SOGoGCSFolder.m
View File

@@ -1,9 +1,7 @@
/* SOGoGCSFolder.m - this file is part of SOGo /* SOGoGCSFolder.m - this file is part of SOGo
* *
* Copyright (C) 2004-2005 SKYRIX Software AG * Copyright (C) 2004-2005 SKYRIX Software AG
* Copyright (C) 2006-2012 Inverse inc. * Copyright (C) 2006-2014 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* *
* This file is free software; you can redistribute it and/or modify * This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -1358,11 +1356,15 @@ static NSArray *childRecordFields = nil;
} }
NSZoneFree (NULL, selectors); NSZoneFree (NULL, selectors);
/* If we haven't gotten any result to return, let's use the previously
supplied sync-token */
if (max == 0)
newToken = syncToken;
/* If the most recent c_lastmodified is "now", we need to return "now - 1" /* If the most recent c_lastmodified is "now", we need to return "now - 1"
in order to make sure during the next sync that every records that might in order to make sure during the next sync that every records that might
get added at the same moment are not lost. */ get added at the same moment are not lost. */
if (!newToken || newToken == now) else if (!newToken || newToken == now)
newToken = now - 1; newToken = now - 1;
newTokenStr = [NSString stringWithFormat: @"%d", newToken]; newTokenStr = [NSString stringWithFormat: @"%d", newToken];