diff --git a/modules/aggregator/aggregator.admin.inc b/modules/aggregator/aggregator.admin.inc index 32e0cc12d54..c7012598cf5 100644 --- a/modules/aggregator/aggregator.admin.inc +++ b/modules/aggregator/aggregator.admin.inc @@ -361,8 +361,7 @@ function _aggregator_parse_opml($opml) { if ($entry['tag'] == 'OUTLINE' && isset($entry['attributes'])) { $item = $entry['attributes']; if (!empty($item['XMLURL'])) { - $title = isset($item['TEXT']) ? $item['TEXT'] : $item['XMLURL']; - $feeds[] = array('title' => $title, 'url' => $item['XMLURL']); + $feeds[] = array('title' => $item['TEXT'], 'url' => $item['XMLURL']); } } } diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test index fa39ecf52d9..11fc75dcd12 100644 --- a/modules/aggregator/aggregator.test +++ b/modules/aggregator/aggregator.test @@ -585,7 +585,7 @@ class ImportOPMLTestCase extends AggregatorTestCase { $this->assertRaw(t('A feed named %title already exists.', array('%title' => $feeds[1]['title'])), t('Verifying that a duplicate title was identified')); $after = db_query('SELECT COUNT(*) FROM {aggregator_feed}')->fetchField(); - $this->assertEqual($after, 3, t('Verifying that three distinct feeds were added.')); + $this->assertEqual($after, 2, t('Verifying that two distinct feeds were added.')); $feeds_from_db = db_query("SELECT f.title, f.url, f.refresh, cf.cid FROM {aggregator_feed} f LEFT JOIN {aggregator_category_feed} cf ON f.fid = cf.fid"); $refresh = $category = TRUE;