[Pkg-owncloud-commits] [php-sabre-vobject] 23/106: keep time & timezone information for recurring events, fix for #101

[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 017defff5cc2fdef8784d1c439960137786e965c
Author: Armin Hackmann <armin at fruux.com>
Date:   Tue Jul 22 13:54:23 2014 +0200

    keep time & timezone information for recurring events, fix for #101
---
 lib/Sabre/VObject/RecurrenceIterator.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Sabre/VObject/RecurrenceIterator.php b/lib/Sabre/VObject/RecurrenceIterator.php
index ce50ffe..851dec9 100644
--- a/lib/Sabre/VObject/RecurrenceIterator.php
+++ b/lib/Sabre/VObject/RecurrenceIterator.php
@@ -905,7 +905,7 @@ class RecurrenceIterator implements \Iterator {
             // This line does not currently work in hhvm. Temporary workaround
             // follows:
             // $this->currentDate->modify('first day of this month');
-            $this->currentDate = new \DateTime($this->currentDate->format('Y-m-1'));
+            $this->currentDate = new \DateTime($this->currentDate->format('Y-m-1 H:i:s'), $this->currentDate->getTimezone());
             // end of workaround
             $this->currentDate->modify('+ ' . $this->interval . ' months');
 

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