summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2015-02-18 12:58:33 +0000
committerAlex Pott2015-02-18 12:58:33 +0000
commit61e09de0f30426781ca21917bb24a35a7fefb5a3 (patch)
treeafd3e2cc362ad81c3c1d34669350157a5e56447e
parent7b3189de17c00fc247dcd07e1fb566133c4adebe (diff)
Issue #1763964 by ParisLiakos, mrded: Use #type => link for theme_aggregator_block_item()
-rw-r--r--core/modules/aggregator/aggregator.module4
-rw-r--r--core/modules/aggregator/aggregator.theme.inc17
-rw-r--r--core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php5
-rw-r--r--core/modules/aggregator/templates/aggregator-block-item.html.twig15
-rw-r--r--core/themes/classy/templates/aggregator/aggregator-block-item.html.twig15
5 files changed, 3 insertions, 53 deletions
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 238ead5..33da2f7 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -66,10 +66,6 @@ function aggregator_theme() {
'render element' => 'elements',
'file' => 'aggregator.theme.inc',
),
- 'aggregator_block_item' => array(
- 'variables' => array('item' => NULL, 'feed' => 0),
- 'file' => 'aggregator.theme.inc',
- ),
'aggregator_item' => array(
'render element' => 'elements',
'file' => 'aggregator.theme.inc',
diff --git a/core/modules/aggregator/aggregator.theme.inc b/core/modules/aggregator/aggregator.theme.inc
index 706a01e..75c31dd 100644
--- a/core/modules/aggregator/aggregator.theme.inc
+++ b/core/modules/aggregator/aggregator.theme.inc
@@ -48,20 +48,3 @@ function template_preprocess_aggregator_feed(&$variables) {
$variables['full'] = $variables['elements']['#view_mode'] == 'full';
$variables['title'] = String::checkPlain($feed->label());
}
-
-/**
- * Prepares variables for individual feed item block templates.
- *
- * Default template: aggregator-block-item.html.twig.
- *
- * @param array $variables
- * An associative array containing:
- * - item: The item to be displayed.
- * - feed: Not used.
- */
-function template_preprocess_aggregator_block_item(&$variables) {
- // Display the external link to the item.
- $item = $variables['item'];
- $variables['url'] = check_url($item->getLink());
- $variables['title'] = String::checkPlain($item->label());
-}
diff --git a/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
index 16ca1af..b4b08b2 100644
--- a/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
+++ b/core/modules/aggregator/src/Plugin/Block/AggregatorFeedBlock.php
@@ -171,8 +171,9 @@ class AggregatorFeedBlock extends BlockBase implements ContainerFactoryPluginInt
$rendered_items = array();
foreach ($items as $item) {
$aggregator_block_item = array(
- '#theme' => 'aggregator_block_item',
- '#item' => $item,
+ '#type' => 'link',
+ '#href' => $item->getLink(),
+ '#title' => $item->label(),
);
$rendered_items[] = drupal_render($aggregator_block_item);
}
diff --git a/core/modules/aggregator/templates/aggregator-block-item.html.twig b/core/modules/aggregator/templates/aggregator-block-item.html.twig
deleted file mode 100644
index c5a7f3c..0000000
--- a/core/modules/aggregator/templates/aggregator-block-item.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for feed item for display in the block.
- *
- * Available variables:
- * - url: URL to the feed item.
- * - title: Title of the feed item.
- *
- * @see template_preprocess_aggregator_block_item()
- *
- * @ingroup themeable
- */
-#}
-<a href="{{ url }}">{{ title }}</a>
diff --git a/core/themes/classy/templates/aggregator/aggregator-block-item.html.twig b/core/themes/classy/templates/aggregator/aggregator-block-item.html.twig
deleted file mode 100644
index c5a7f3c..0000000
--- a/core/themes/classy/templates/aggregator/aggregator-block-item.html.twig
+++ /dev/null
@@ -1,15 +0,0 @@
-{#
-/**
- * @file
- * Default theme implementation for feed item for display in the block.
- *
- * Available variables:
- * - url: URL to the feed item.
- * - title: Title of the feed item.
- *
- * @see template_preprocess_aggregator_block_item()
- *
- * @ingroup themeable
- */
-#}
-<a href="{{ url }}">{{ title }}</a>