Merge branch 'master' into horde_5_2

horde · Oct 22, 2013 · 4dcfdf7 · 4dcfdf7
2 parents 30b5776 + 7c3bffe
commit 4dcfdf7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php b/framework/ActiveSync/lib/Horde/ActiveSync/State/Mongo.php
@@ -844,7 +844,10 @@ public function getLastSyncTimestamp($id = null, $user = null)
         if (empty($results) || empty($results['ok'])) {
             throw new Horde_ActiveSync_Exception('Error running aggregation.');
         }
-        $results = current($results);
+        if (empty($results) || empty($results['ok'])) {
+            return 0;
+        }
+        $results = current($results['result']);
         return $results['max'];
     }