Commit 857f1b1c authored by Kjartan's avatar Kjartan

- Fixed bug #7094: Incorrect displayed umlauts in ISO-8859-1 RSS-feeds.

- Fixed feed status not being reset when items are removed.
parent 2ca7eb71
......@@ -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["'"] = "'";
/*
......
......@@ -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["'"] = "'";
/*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment