From 5a3bc9e178d2f2b4e00e8db05ba61321faf97e1f Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Fri, 3 Sep 2010 20:59:03 +0000
Subject: [PATCH] #901798: Fix time off in SitemapParser.
---
CHANGELOG.txt | 1 +
plugins/FeedsSitemapParser.inc | 4 ++++
tests/feeds.test | 1 +
3 files changed, 6 insertions(+)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d6a2d6c6..63de8a10 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
Feeds 6.x 1.0 XXXXXXXXXXXXXXXXXX
--------------------------------
+- #901798 alex_b: Fix time off in SitemapParser.
- #885724 eliotttf: Avoid array_flip() on non scalars.
- #885052 Hanno: Fix small typo in access rights.
- #863494 ekes, alex_b: Delete temporary enclosures file.
diff --git a/plugins/FeedsSitemapParser.inc b/plugins/FeedsSitemapParser.inc
index b0180a57..7472dc40 100644
--- a/plugins/FeedsSitemapParser.inc
+++ b/plugins/FeedsSitemapParser.inc
@@ -9,6 +9,9 @@ class FeedsSitemapParser extends FeedsParser {
* Implementation of FeedsParser::parse().
*/
public function parse(FeedsImportBatch $batch, FeedsSource $source) {
+ // Set time zone to GMT for parsing dates with strtotime().
+ $tz = date_default_timezone_get();
+ date_default_timezone_set('GMT');
// Yes, using a DOM parser is a bit inefficient, but will do for now
$xml = new SimpleXMLElement($batch->getRaw());
foreach ($xml->url as $url) {
@@ -24,6 +27,7 @@ class FeedsSitemapParser extends FeedsParser {
}
$batch->addItem($item);
}
+ date_default_timezone_set($tz);
}
/**
diff --git a/tests/feeds.test b/tests/feeds.test
index 608307b4..19424967 100644
--- a/tests/feeds.test
+++ b/tests/feeds.test
@@ -982,6 +982,7 @@ class FeedsSitemapParserTestCase extends FeedsWebTestCase {
$result = db_query('SELECT * FROM {feeds_node_item} WHERE feed_nid = %d ORDER BY nid', $nid);
// Check first item.
+ date_default_timezone_set('GMT');
$item = db_fetch_object($result);
$node = node_load($item->nid);
$this->assertEqual($node->title, 'monthly', 'Feed item 1 changefreq is correct.');
--
GitLab