1c1
< From abb898635216bc1f20209f145cbbf99e311f9c68 Mon Sep 17 00:00:00 2001
---
> From 65a724fa042577b18da1640a546e29a3ccc9b816 Mon Sep 17 00:00:00 2001
8c8
<  core/modules/aggregator/aggregator.admin.inc     |  137 +++++++++++++++++-----
---
>  core/modules/aggregator/aggregator.admin.inc     |  141 +++++++++++++++++-----
11,13c11,13
<  core/modules/aggregator/aggregator.pages.inc     |   61 ++++++-----
<  core/modules/aggregator/aggregator.parser.inc    |   63 ++++++++--
<  core/modules/aggregator/aggregator.processor.inc |   53 +++++++--
---
>  core/modules/aggregator/aggregator.pages.inc     |   65 ++++++----
>  core/modules/aggregator/aggregator.parser.inc    |   59 +++++++--
>  core/modules/aggregator/aggregator.processor.inc |   53 ++++++--
15c15
<  8 files changed, 246 insertions(+), 94 deletions(-)
---
>  8 files changed, 250 insertions(+), 94 deletions(-)
30c30
< index 09da1cf..c054751 100644
---
> index 09da1cf..025c9d3 100644
57c57
< @@ -38,7 +44,14 @@ function aggregator_view() {
---
> @@ -38,7 +44,16 @@ function aggregator_view() {
62,67c62,70
< +  $table = array(
< +    'header' => $header,
< +    'rows' => $rows,
< +    'empty' => t('No feeds available. <a href="@link">Add feed</a>.', array(
< +      '@link' => url('admin/config/services/aggregator/add/feed'),
< +    )),
---
> +  $output .= theme(
> +    'table',
> +    array(
> +      'header' => $header,
> +      'rows' => $rows,
> +      'empty' => t('No feeds available. <a href="@link">Add feed</a>.', array(
> +        '@link' => url('admin/config/services/aggregator/add/feed'),
> +      )),
> +    )
69d71
< +  $output .= theme('table', $table);
73c75
< @@ -47,9 +60,20 @@ function aggregator_view() {
---
> @@ -47,9 +62,22 @@ function aggregator_view() {
85,90c87,95
< +  $table = array(
< +    'header' => $header,
< +    'rows' => $rows,
< +    'empty' => t('No categories available. <a href="@link">Add category</a>.', array(
< +      '@link' => url('admin/config/services/aggregator/add/category'),
< +    )),
---
> +  $output .= theme(
> +    'table',
> +    array(
> +      'header' => $header,
> +      'rows' => $rows,
> +      'empty' => t('No categories available. <a href="@link">Add category</a>.', array(
> +        '@link' => url('admin/config/services/aggregator/add/category'),
> +      )),
> +    )
92d96
< +  $output .= theme('table', $table);
96c100
< @@ -57,7 +81,7 @@ function aggregator_view() {
---
> @@ -57,7 +85,7 @@ function aggregator_view() {
105c109
< @@ -67,10 +91,28 @@ function aggregator_view() {
---
> @@ -67,10 +95,28 @@ function aggregator_view() {
136c140
< @@ -85,26 +127,30 @@ function aggregator_form_feed($form, &$form_state, stdClass $feed = NULL) {
---
> @@ -85,26 +131,30 @@ function aggregator_form_feed($form, &$form_state, stdClass $feed = NULL) {
172c176
< @@ -145,10 +191,23 @@ function aggregator_form_feed_validate($form, &$form_state) {
---
> @@ -145,10 +195,23 @@ function aggregator_form_feed_validate($form, &$form_state) {
198c202
< @@ -208,7 +267,7 @@ function aggregator_form_feed_submit($form, &$form_state) {
---
> @@ -208,7 +271,7 @@ function aggregator_form_feed_submit($form, &$form_state) {
207c211
< @@ -249,7 +308,24 @@ function aggregator_admin_remove_feed_submit($form, &$form_state) {
---
> @@ -249,7 +312,24 @@ function aggregator_admin_remove_feed_submit($form, &$form_state) {
233c237
< @@ -269,14 +345,15 @@ function aggregator_form_opml($form, &$form_state) {
---
> @@ -269,14 +349,15 @@ function aggregator_form_opml($form, &$form_state) {
252c256
< @@ -289,7 +366,7 @@ function aggregator_form_opml($form, &$form_state) {
---
> @@ -289,7 +370,7 @@ function aggregator_form_opml($form, &$form_state) {
261c265
< @@ -367,10 +444,10 @@ function aggregator_form_opml_submit($form, &$form_state) {
---
> @@ -367,10 +448,10 @@ function aggregator_form_opml_submit($form, &$form_state) {
274c278
< @@ -397,7 +474,7 @@ function _aggregator_parse_opml($opml) {
---
> @@ -397,7 +478,7 @@ function _aggregator_parse_opml($opml) {
283c287
< @@ -506,7 +583,7 @@ function aggregator_admin_form($form, $form_state) {
---
> @@ -506,7 +587,7 @@ function aggregator_admin_form($form, $form_state) {
292c296
< @@ -535,7 +612,7 @@ function aggregator_admin_form_submit($form, &$form_state) {
---
> @@ -535,7 +616,7 @@ function aggregator_admin_form_submit($form, &$form_state) {
301c305
< @@ -547,13 +624,15 @@ function aggregator_admin_form_submit($form, &$form_state) {
---
> @@ -547,13 +628,15 @@ function aggregator_admin_form_submit($form, &$form_state) {
319c323
< @@ -574,7 +653,7 @@ function aggregator_form_category($form, &$form_state, $edit = array('title' =>
---
> @@ -574,7 +657,7 @@ function aggregator_form_category($form, &$form_state, $edit = array('title' =>
440c444
< index ebb561b..6945a3f 100644
---
> index ebb561b..e121225 100644
569c573
< @@ -282,7 +284,11 @@ function theme_aggregator_categorize_items($variables) {
---
> @@ -282,7 +284,13 @@ function theme_aggregator_categorize_items($variables) {
574,576c578,583
< +  $table = array(
< +    'header' => array('', t('Categorize')),
< +    'rows' => $rows,
---
> +  $output .= theme(
> +    'table',
> +    array(
> +      'header' => array('', t('Categorize')),
> +      'rows' => $rows,
> +    )
578d584
< +  $output .= theme('table', $table);
582c588
< @@ -292,7 +298,7 @@ function theme_aggregator_categorize_items($variables) {
---
> @@ -292,7 +300,7 @@ function theme_aggregator_categorize_items($variables) {
591c597
< @@ -419,13 +425,11 @@ function aggregator_page_rss() {
---
> @@ -419,13 +427,11 @@ function aggregator_page_rss() {
606c612
< @@ -445,6 +449,7 @@ function theme_aggregator_page_rss($variables) {
---
> @@ -445,6 +451,7 @@ function theme_aggregator_page_rss($variables) {
614c620
< @@ -467,7 +472,7 @@ function theme_aggregator_page_rss($variables) {
---
> @@ -467,7 +474,7 @@ function theme_aggregator_page_rss($variables) {
623c629
< @@ -488,12 +493,10 @@ function aggregator_page_opml($cid = NULL) {
---
> @@ -488,12 +495,10 @@ function aggregator_page_opml($cid = NULL) {
637c643
< @@ -538,13 +541,13 @@ function template_preprocess_aggregator_summary_item(&$variables) {
---
> @@ -538,13 +543,13 @@ function template_preprocess_aggregator_summary_item(&$variables) {
653c659
< @@ -559,7 +562,11 @@ function template_preprocess_aggregator_summary_item(&$variables) {
---
> @@ -559,7 +564,13 @@ function template_preprocess_aggregator_summary_item(&$variables) {
658,660c664,669
< +  $feed_icon_variables = array(
< +    'url' => $feed->url,
< +    'title' => t('!title feed', array('!title' => $feed->title)),
---
> +  $variables['source_icon'] = theme(
> +    'feed_icon',
> +    array(
> +      'url' => $feed->url,
> +      'title' => t('!title feed', array('!title' => $feed->title)),
> +    )
662d670
< +  $variables['source_icon'] = theme('feed_icon', $feed_icon_variables);
667c675
< index 0f594d4..8b68738 100644
---
> index 0f594d4..9bb78a3 100644
686c694
< @@ -79,8 +79,18 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -79,8 +79,14 @@ function aggregator_parse_feed(&$data, $feed) {
692c700,701
< +    $variables = array(
---
> +    $message = 'The feed from %site seems to be broken due to an error "%error" on line %line.';
> +    $message_variables = array(
697,703c706,707
< +    watchdog('aggregator', 'The feed from %site seems to be broken due to an error "%error" on line %line.', $variables, WATCHDOG_WARNING);
< +    $options = array(
< +      '%site' => $feed->title,
< +      '%error' => xml_error_string(xml_get_error_code($xml_parser)),
< +      '%line' => xml_get_current_line_number($xml_parser),
< +    );
< +    drupal_set_message(t('The feed from %site seems to be broken because of error "%error" on line %line.', $options), 'error');
---
> +    watchdog('aggregator', $message, $message_variables, WATCHDOG_WARNING);
> +    drupal_set_message(t($message, $message_variables), 'error');
707c711
< @@ -124,7 +134,8 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -124,7 +130,8 @@ function aggregator_parse_feed(&$data, $feed) {
717c721
< @@ -137,7 +148,19 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -137,7 +144,19 @@ function aggregator_parse_feed(&$data, $feed) {
738c742
< @@ -147,7 +170,8 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -147,7 +166,8 @@ function aggregator_parse_feed(&$data, $feed) {
748c752
< @@ -157,7 +181,8 @@ function aggregator_parse_feed(&$data, $feed) {
---
> @@ -157,7 +177,8 @@ function aggregator_parse_feed(&$data, $feed) {
758c762
< @@ -183,6 +208,7 @@ function aggregator_element_start($parser, $name, $attributes) {
---
> @@ -183,6 +204,7 @@ function aggregator_element_start($parser, $name, $attributes) {
766c770
< @@ -201,10 +227,12 @@ function aggregator_element_start($parser, $name, $attributes) {
---
> @@ -201,10 +223,12 @@ function aggregator_element_start($parser, $name, $attributes) {
779c783
< @@ -230,6 +258,7 @@ function aggregator_element_end($parser, $name) {
---
> @@ -230,6 +254,7 @@ function aggregator_element_end($parser, $name) {
787c791
< @@ -251,36 +280,43 @@ function aggregator_element_data($parser, $data) {
---
> @@ -251,36 +276,43 @@ function aggregator_element_data($parser, $data) {
831c835
< @@ -294,18 +330,19 @@ function aggregator_element_data($parser, $data) {
---
> @@ -294,18 +326,19 @@ function aggregator_element_data($parser, $data) {