[commits] Horde branch master updated. 23ca03c1902391b36e30dcd4d473e3f6ee50ce45

[Jan Schneider]

The branch "master" has been updated.
The following is a summary of the commits.

from: c4a4fab1ddb0909ad1729c74123de0ab8e26ce06

5eb27a0 Fix date calculation if providing both a timestamp and a timezone.
9e26d10 Revert "Move tests to timezonesTest."
23ca03c Revert "Add currently failing test for Bug: 12843"

Summary: http://github.com/horde/horde/compare/c4a4fab1ddb0909ad1729c74123de0ab8e26ce06...23ca03c1902391b36e30dcd4d473e3f6ee50ce45

-----------------------------------------------------------------------

commit 5eb27a0b1b12c99226ff819d4ce0f5c8e66e3c08
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 11 18:13:04 2014 +0100

    Fix date calculation if providing both a timestamp and a timezone.
    
    We need to temporarily set the timezone to the one provided in the contructor,
    because the result of getdate() depends on the current default timezone. It's
    probably the only method in the whole world that does this.
    
    Bug: 12843

 framework/Date/lib/Horde/Date.php           |    7 +++++++
 framework/Date/package.xml                  |    2 ++
 framework/Date/test/Horde/Date/DateTest.php |   10 ++++++++++
 3 files changed, 19 insertions(+), 0 deletions(-)

http://github.com/horde/horde/commit/5eb27a0b1b12c99226ff819d4ce0f5c8e66e3c08
http://git.horde.org/horde-git/-/commit/5eb27a0b1b12c99226ff819d4ce0f5c8e66e3c08

-----------------------------------------------------------------------

commit 9e26d10308c3676cf8e558f43b1e8237303a097d
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 11 18:17:40 2014 +0100

    Revert "Move tests to timezonesTest."
    
    Bug is in Horde_Date.
    
    This reverts commit 76a135f2560e0aded3b4cfbf9dbfa7e11ccd70eb.

 framework/Icalendar/package.xml                            |    2 +
 framework/Icalendar/test/Horde/Icalendar/DateTest.php      |   50 ++++++++++++
 framework/Icalendar/test/Horde/Icalendar/TimezonesTest.php |   37 ---------
 3 files changed, 52 insertions(+), 37 deletions(-)
 create mode 100644 framework/Icalendar/test/Horde/Icalendar/DateTest.php

http://github.com/horde/horde/commit/9e26d10308c3676cf8e558f43b1e8237303a097d
http://git.horde.org/horde-git/-/commit/9e26d10308c3676cf8e558f43b1e8237303a097d

-----------------------------------------------------------------------

commit 23ca03c1902391b36e30dcd4d473e3f6ee50ce45
Author: Jan Schneider <jan at horde.org>
Date:   Tue Feb 11 18:18:04 2014 +0100

    Revert "Add currently failing test for Bug: 12843"
    
    Bug is in Horde_Date.
    
    This reverts commit 29ee3502dacc8fba07c7b355dbe60dbbf0e5e7d1.

 framework/Icalendar/package.xml                                |    9 +-
 framework/Icalendar/test/Horde/Icalendar/DateTest.php          |   50 --------
 framework/Icalendar/test/Horde/Icalendar/fixtures/bug12843.ics |   41 ------
 3 files changed, 3 insertions(+), 97 deletions(-)
 delete mode 100644 framework/Icalendar/test/Horde/Icalendar/DateTest.php
 delete mode 100644 framework/Icalendar/test/Horde/Icalendar/fixtures/bug12843.ics

http://github.com/horde/horde/commit/23ca03c1902391b36e30dcd4d473e3f6ee50ce45
http://git.horde.org/horde-git/-/commit/23ca03c1902391b36e30dcd4d473e3f6ee50ce45