commit efeba6a40b05b0d77345140aaef6845c39b778aa Author: Shane Auckland Date: Sat Apr 13 08:59:41 2013 +0100 1896060-new_changes diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module index 5ca6ea2..9e8a5f8 100644 --- a/core/modules/aggregator/aggregator.module +++ b/core/modules/aggregator/aggregator.module @@ -523,9 +523,9 @@ function aggregator_category_load($cid) { } /** - * Processes variables for an individual feed item for display in the block. + * Prepares variables for an individual feed item for display in the block. * - * Default template: aggregator-item.tpl.php + * Default template: aggregator-block-item.html.twig. * * @param $variables * An associative array containing: diff --git a/core/modules/aggregator/aggregator.pages.inc b/core/modules/aggregator/aggregator.pages.inc index 8e14ae7..0782769 100644 --- a/core/modules/aggregator/aggregator.pages.inc +++ b/core/modules/aggregator/aggregator.pages.inc @@ -284,12 +284,12 @@ function aggregator_categorize_items_submit($form, &$form_state) { /** * Processes variables for aggregator item templates. * - * Default template: aggregator-item.tpl.php + * Default template: aggregator-item.html.twig. * - * @param $variables + * @param array $variables * An associative array containing: * - aggregator_item: An individual feed item for display on the aggregator - * page. + * page. */ function template_preprocess_aggregator_item(&$variables) { $item = $variables['aggregator_item']; @@ -464,12 +464,12 @@ function template_preprocess_aggregator_page_rss(&$variables) { } $items[] = format_rss_item($feed->ftitle . ': ' . $feed->title, $feed->link, $feed->description, array('pubDate' => date('r', $feed->timestamp))); } - + $site_name = config('system.site')->get('name'); $url = url((isset($category) ? 'aggregator/categories/' . $category->cid : 'aggregator'), array('absolute' => TRUE)); $description = isset($category) ? t('@site_name - aggregated feeds in category @title', array('@site_name' => $site_name, '@title' => $category->title)) : t('@site_name - aggregated feeds', array('@site_name' => $site_name)); - $variables['title'] = check_plain(t('@site_name aggregator', array('@site_name' => $site_name))); + $variables['title'] = t('@site_name aggregator', array('@site_name' => $site_name)); $variables['link'] = check_url($url); // The RSS 2.0 "spec" doesn't indicate HTML can be used in the description. // We strip all HTML tags, but need to prevent double encoding from properly @@ -539,7 +539,7 @@ function template_preprocess_aggregator_page_opml(&$variables) { /** * Processes variables for aggregator summary templates. * - * Default template: aggregator-summary-items.tpl.php + * Default template: aggregator-summary-items.html.twig. * * @param array $variables * An associative array containing: @@ -589,7 +589,7 @@ function template_preprocess_aggregator_summary_item(&$variables) { /** * Processes variables for aggregator feed source templates. * - * Default template: aggregator-feed-source.tpl.php + * Default template: aggregator-feed-source.html.twig. * * @param array $variables * An associative array containing: