]> git.mjollnir.org Git - s9y.git/commitdiff
fix timezone detection
authorgarvinhicking <garvinhicking>
Mon, 14 Nov 2005 16:20:35 +0000 (16:20 +0000)
committergarvinhicking <garvinhicking>
Mon, 14 Nov 2005 16:20:35 +0000 (16:20 +0000)
include/admin/importers/generic.inc.php

index 9d52b29b9cd8ba272c942b5ed24872d3af689e74..e22369ca9a52e234fda5bfdcc5c0960a535c5695 100644 (file)
@@ -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();