Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Oops. Reverting aggregator stuff that I didn't mean to commit.

merge-requests/26/head
Angie Byron 2008-11-07 07:12:52 +00:00
parent a8576b12f3
commit 9852b3a70c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/aggregator/aggregator.admin.inc
View File

@ -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']);
}
}
}

2
modules/aggregator/aggregator.test
View File

@ -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;