From: garvinhicking <garvinhicking>
Date: Mon, 14 Nov 2005 16:20:35 +0000 (+0000)
Subject: fix timezone detection
X-Git-Tag: 0.9.1~28
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3e2be2ab2fbd6416e009c7ddc7ad57b47fb59484;p=s9y.git

fix timezone detection
---

diff --git a/include/admin/importers/generic.inc.php b/include/admin/importers/generic.inc.php
index 9d52b29..e22369c 100644
--- a/include/admin/importers/generic.inc.php
+++ b/include/admin/importers/generic.inc.php
@@ -91,7 +91,7 @@ class Serendipity_Import_Generic extends Serendipity_Import {
         $entry['timestamp'] = $this->decode(strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']));
         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)) {
+            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]);
             } else {
                 $entry['timestamp'] = time();