[Pkg-owncloud-commits] [php-sabre-vobject] 282/341: Merge branch '3.4'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit 2602d9ae53b373cf3185ef03d22b6e978226b4b0
Merge: c8052c9 2d65e8d
Author: Evert Pot <me at evertpot.com>
Date:   Tue Jun 23 12:40:32 2015 -0400

    Merge branch '3.4'

 lib/Component/VEvent.php               | 6 +++---
 tests/VObject/Component/VEventTest.php | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --cc lib/Component/VEvent.php
index e154a0a,a1b4fe2..bc3750d
--- a/lib/Component/VEvent.php
+++ b/lib/Component/VEvent.php
@@@ -53,17 -52,19 +53,17 @@@ class VEvent extends VObject\Component 
              //
              // See:
              // http://tools.ietf.org/html/rfc5545#page-54
-             $effectiveEnd = $this->DTEND->getDateTime();
+             $effectiveEnd = $this->DTEND->getDateTime($end->getTimezone());
  
          } elseif (isset($this->DURATION)) {
 -            $effectiveEnd = clone $effectiveStart;
 -            $effectiveEnd->add(VObject\DateTimeParser::parseDuration($this->DURATION));
 +            $effectiveEnd = $effectiveStart->add(VObject\DateTimeParser::parseDuration($this->DURATION));
          } elseif (!$this->DTSTART->hasTime()) {
 -            $effectiveEnd = clone $effectiveStart;
 -            $effectiveEnd->modify('+1 day');
 +            $effectiveEnd = $effectiveStart->modify('+1 day');
          } else {
 -            $effectiveEnd = clone $effectiveStart;
 +            $effectiveEnd = $effectiveStart;
          }
          return (
-             ($start <= $effectiveEnd) && ($end > $effectiveStart)
+             ($start < $effectiveEnd) && ($end > $effectiveStart)
          );
  
      }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git