1c1
< From 65a724fa042577b18da1640a546e29a3ccc9b816 Mon Sep 17 00:00:00 2001
---
> From 8d96495d8880eb71f06925d65ec8f3d5cce9639c Mon Sep 17 00:00:00 2001
12c12
<  core/modules/aggregator/aggregator.parser.inc    |   59 +++++++--
---
>  core/modules/aggregator/aggregator.parser.inc    |   58 +++++++--
15c15
<  8 files changed, 250 insertions(+), 94 deletions(-)
---
>  8 files changed, 249 insertions(+), 94 deletions(-)
675c675
< index 0f594d4..9bb78a3 100644
---
> index 0f594d4..9a55158 100644
694c694
< @@ -79,8 +79,14 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -79,8 +79,13 @@ function aggregator_parse_feed(&$data, $feed) {
700d699
< +    $message = 'The feed from %site seems to be broken due to an error "%error" on line %line.';
706,707c705,706
< +    watchdog('aggregator', $message, $message_variables, WATCHDOG_WARNING);
< +    drupal_set_message(t($message, $message_variables), 'error');
---
> +    watchdog('aggregator', 'The feed from %site seems to be broken due to an error "%error" on line %line.', $message_variables, WATCHDOG_WARNING);
> +    drupal_set_message(t('The feed from %site seems to be broken due to an error "%error" on line %line.', $message_variables), 'error');
711c710
< @@ -124,7 +130,8 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -124,7 +129,8 @@ function aggregator_parse_feed(&$data, $feed) {
721c720
< @@ -137,7 +144,19 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -137,7 +143,19 @@ function aggregator_parse_feed(&$data, $feed) {
742c741
< @@ -147,7 +166,8 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -147,7 +165,8 @@ function aggregator_parse_feed(&$data, $feed) {
752c751
< @@ -157,7 +177,8 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -157,7 +176,8 @@ function aggregator_parse_feed(&$data, $feed) {
762c761
< @@ -183,6 +204,7 @@ function aggregator_element_start($parser, $name, $attributes) {
---
> @@ -183,6 +203,7 @@ function aggregator_element_start($parser, $name, $attributes) {
770c769
< @@ -201,10 +223,12 @@ function aggregator_element_start($parser, $name, $attributes) {
---
> @@ -201,10 +222,12 @@ function aggregator_element_start($parser, $name, $attributes) {
783c782
< @@ -230,6 +254,7 @@ function aggregator_element_end($parser, $name) {
---
> @@ -230,6 +253,7 @@ function aggregator_element_end($parser, $name) {
791c790
< @@ -251,36 +276,43 @@ function aggregator_element_data($parser, $data) {
---
> @@ -251,36 +275,43 @@ function aggregator_element_data($parser, $data) {
835c834
< @@ -294,18 +326,19 @@ function aggregator_element_data($parser, $data) {
---
> @@ -294,18 +325,19 @@ function aggregator_element_data($parser, $data) {