Correct conditional that catches conflicts.

Allow the next event to start at the end time of the previous event.

diff --git a/kronolith/lib/Resource/Single.php b/kronolith/lib/Resource/Single.php
index 6e47f85..5b5c902 100644 (file)
--- a/kronolith/lib/Resource/Single.php
+++ b/kronolith/lib/Resource/Single.php
@@ -57,8 +57,10 @@ class Kronolith_Resource_Single extends Kronolith_Resource_Base
                       $e->hasStatus(Kronolith::STATUS_FREE)) &&
                      $e->getUID() !== $uid) {
 
-                     if (!($e->start->compareDateTime($end) >= 1 ||
-                         $e->end->compareDateTime($start) <= -1)) {
+                     // Comparing to zero allows the events to start at the same
+                     // the previous event ends.
+                     if (!($e->start->compareDateTime($end) >= 0) &&
+                         !($e->end->compareDateTime($start) <= 0)) {
 
                         return false;
                      }