diff --git a/mappers/date.inc b/mappers/date.inc index 75227ea1aed0a771c06496fc050027229c749654..807a6a7618c1f01cb5e0bb21b43c021f04725e4a 100644 --- a/mappers/date.inc +++ b/mappers/date.inc @@ -48,7 +48,7 @@ function date_feeds_processor_targets_alter(&$targets, $entity_type, $bundle_nam * @todo Support array of values for dates. */ function date_feeds_set_target($entity, $target, $feed_element) { - list($field_name, $sub_field) = split(':', $target); + list($field_name, $sub_field) = explode(':', $target, 2); if (!($feed_element instanceof FeedsDateTimeElement)) { if (is_array($feed_element)) { $feed_element = $feed_element[0]; diff --git a/plugins/FeedsParser.inc b/plugins/FeedsParser.inc index 4a5ce4152dd802ace3e663b0e4fa78dc2082a023..335f8f264d79798e7d97806abca80c78510fcb6e 100644 --- a/plugins/FeedsParser.inc +++ b/plugins/FeedsParser.inc @@ -503,7 +503,7 @@ class FeedsDateTimeElement extends FeedsElement { if (!date_timezone_is_valid($use_start->getTimezone()->getName())) { $use_start->setTimezone(new DateTimeZone("UTC")); } - $db_tz = date_get_timezone_db($info['setting']['tz_handling'], $use_start->getTimezone()->getName()); + $db_tz = date_get_timezone_db($info['settings']['tz_handling'], $use_start->getTimezone()->getName()); } if ($use_end) { $use_end = $use_end->merge($temp); diff --git a/tests/feeds.test.inc b/tests/feeds.test.inc index 72496e6ca2ee8cdd5a8fdf0d0280dde9853b8bee..65e93d0ab38c42dbb9d176c1083e6a0b67f8b4a1 100644 --- a/tests/feeds.test.inc +++ b/tests/feeds.test.inc @@ -320,7 +320,7 @@ class FeedsWebTestCase extends DrupalWebTestCase { } $edit = array( 'feeds[FeedsHTTPFetcher][source]' => $feed_url, - ); + ); $nid = $this->drupalPost('import/'. $id, $edit, 'Import'); // Check whether feed got recorded in feeds_source table. diff --git a/tests/feeds_mapper_date.test b/tests/feeds_mapper_date.test index 53c9ca7676185b72602686a55172b8f590fe8cc7..b20fad7064c0cf168703bc6d99490385a68e9e83 100644 --- a/tests/feeds_mapper_date.test +++ b/tests/feeds_mapper_date.test @@ -36,7 +36,7 @@ class FeedsMapperDateTestCase extends FeedsMapperTestCase { */ public function test() { $this->drupalGet('admin/config/regional/settings'); - return; + // Create content type. $typename = $this->createContentType(NULL, array( 'date' => 'date', @@ -71,7 +71,6 @@ class FeedsMapperDateTestCase extends FeedsMapperTestCase { $edit = array( 'allowed_extensions' => 'rss2', - 'direct' => 1, ); $this->drupalPost('admin/structure/feeds/edit/daterss/settings/FeedsFileFetcher', $edit, 'Save');