[mms] Fix regression in handling invalid DateTime data due to a BC-in…

…compatible change in PHP.
horde · Jul 1, 2014 · 65f6cf6 · 65f6cf6
1 parent e8002ba
commit 65f6cf6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/DateTime.php b/framework/Imap_Client/lib/Horde/Imap/Client/DateTime.php
@@ -29,7 +29,8 @@ class Horde_Imap_Client_DateTime extends DateTime
     public function __construct($time = null, $tz = null)
     {
         /* See https://bugs.php.net/bug.php?id=67118 */
-        $bug_67118 = in_array(PHP_VERSION, array('5.4.29', '5.5.13'));
+        $bug_67118 = (PHP_MINOR_VERSION >= 6) ||
+                     in_array(PHP_VERSION, array('5.4.29', '5.5.13'));
         $tz = new DateTimeZone('UTC');
 
         try {

diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Fix regression in handling invalid DateTime data due to a BC-incompatible change in PHP.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -2495,7 +2495,7 @@
    <date>2014-06-17</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Fix regression in handling invalid DateTime data due to a BC-incompatible change in PHP.
    </notes>
   </release>
  </changelog>