summaryrefslogtreecommitdiff
path: root/modules/aggregator.module
diff options
context:
space:
mode:
authorKjartan Mannes <kjartan@2.no-reply.drupal.org>2004-04-29 21:09:00 +0000
committerKjartan Mannes <kjartan@2.no-reply.drupal.org>2004-04-29 21:09:00 +0000
commit857f1b1ccea44e9f6e6d299c4cf2f8c502d515e8 (patch)
treee70bd0562f3b151ca415211b64064115b841a25c /modules/aggregator.module
parent2ca7eb7152f4a90d89e2f17ffd2b0ccf2369a844 (diff)
downloadbrdo-857f1b1ccea44e9f6e6d299c4cf2f8c502d515e8.tar.gz
brdo-857f1b1ccea44e9f6e6d299c4cf2f8c502d515e8.tar.bz2
- Fixed bug #7094: Incorrect displayed umlauts in ISO-8859-1 RSS-feeds.
- Fixed feed status not being reset when items are removed.
Diffstat (limited to 'modules/aggregator.module')
-rw-r--r--modules/aggregator.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 73339b572..05f42a7b3 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -178,7 +178,7 @@ function aggregator_remove($feed) {
db_query('DELETE FROM {aggregator_category_item} WHERE '. implode(' OR ', $items));
}
db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $feed['fid']);
- db_query('UPDATE {aggregator_feed} SET checked = 0 WHERE fid = %d', $feed['fid']);
+ db_query('UPDATE {aggregator_feed} SET checked = 0, etag = '', modified = 0 WHERE fid = %d', $feed['fid']);
drupal_set_message(t('removed news items from \'%site\'.', array('%site' => $feed['title'])));
}
@@ -332,7 +332,7 @@ function aggregator_parse_feed(&$data, $feed) {
xml_parser_free($xml_parser);
// initialize the translation table:
- $tt = array_flip(get_html_translation_table(HTML_ENTITIES));
+ $tt = array_flip(get_html_translation_table(HTML_SPECIALCHARS));
$tt["&apos;"] = "'";
/*