From: garvinhicking <garvinhicking>
Date: Tue, 15 Nov 2005 13:55:04 +0000 (+0000)
Subject: fix time parser
X-Git-Tag: 0.9.1~27
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a5a3a3a5da250030a160999e080a2a0f57ad94fc;p=s9y.git

fix time parser
---

diff --git a/docs/NEWS b/docs/NEWS
index 96b3e7c..a8281ec 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 0.9.1 ()
 ------------------------------------------------------------------------
 
+    * Fix RSS import's timezone detection for ISO-8601 dates
+      (garvinhicking)
+
     * Fix htmlarea when using UTF-8 charset on a ISO-8859-1 language
       (garvinhicking)
          
diff --git a/include/admin/importers/generic.inc.php b/include/admin/importers/generic.inc.php
index e22369c..cefe5d9 100644
--- a/include/admin/importers/generic.inc.php
+++ b/include/admin/importers/generic.inc.php
@@ -92,7 +92,7 @@ class Serendipity_Import_Generic extends Serendipity_Import {
         if ($entry['timestamp'] == -1) {
             // strtotime does not seem to parse ISO 8601 dates
             if (preg_match('@^([0-9]{4})\-([0-9]{2})\-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})[\-\+]([0-9]{2}):([0-9]{2})$@', isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date'], $timematch)) {
-                $entry['timestamp'] = mktime($timematch[4] - $timematch[7], $timematch[5] - $timematch[8], $timematch[6], $timematch[3], $timematch[2], $timematch[1]);
+                $entry['timestamp'] = mktime($timematch[4] - $timematch[7], $timematch[5] - $timematch[8], $timematch[6], $timematch[2], $timematch[3], $timematch[1]);
             } else {
                 $entry['timestamp'] = time();
             }