Replace theme() with drupal_render() in aggregator module

3 files modified.

Thanks for working on this @markie!

I'd like to see better or more descriptive variable names for the render arrays…

+++ b/core/modules/aggregator/aggregator.pages.incundefined
@@ -586,10 +597,22 @@ function template_preprocess_aggregator_summary_item(&$variables) {
+  $themed = array(
+    '#theme' => 'feed_icon',
+    '#url' => $feed->url->value,
+    '#title' => t('!title feed', array('!title' => $feed->label())),
+  );
+  $variables['source_icon'] = drupal_render($themed);

I'd rather see this var called $feed_icon or $source_icon instead of $themed.

+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorCategoryBlock.phpundefined
@@ -68,17 +68,30 @@ protected function blockBuild() {
+      $theme = array(
+        '#theme' => 'more_link',
+        '#url' => 'aggregator/categories/' . $category->cid,
+        '#title' => t("View this category's recent news."),
+      );
+      $read_more = drupal_render($theme);
...
+        $ag_theme = array(
+          '#theme' => 'aggregator_block_item',
+          '#item' => $item,
+        );
+        $items[] = drupal_render($ag_theme);
...
+        $rendered = array(
+          '#theme' => 'item_list',
+          '#items' => $items,
+        );
         return array(
-          '#children' => theme('item_list', array('items' => $items)) . $read_more,
+          '#children' => drupal_render($rendered) . $read_more,

+++ b/core/modules/aggregator/lib/Drupal/aggregator/Plugin/Block/AggregatorFeedBlock.phpundefined
@@ -69,16 +69,28 @@ protected function blockBuild() {
+      $themed = array(
+        '#theme' => 'more_link',
+        '#url' => 'aggregator/sources/' . $feed->fid,
+        '#title' => t("View this feed's recent news."),
+      );
+      $read_more = drupal_render($themed);
...
+        $themed = array(
+          '#theme' => 'aggregator_block_item',
+          '#item' => $item,
+        );
+        $items[] = drupal_render($themed);
...
+        $themed = array(
+          '#theme' => 'item_list',
+          '#items' => $items,
+        );
         return array(
-          '#children' => theme('item_list', array('items' => $items)) . $read_more,
+          '#children' => drupal_render($themed) . $read_more,

Updated as requested.

Tested @markie's patch and everything worked properly. When the aggregator was fed, it responded as requested. There were no apparent issues.

Tested @markie's patch and was successful when using the feed aggregator! Everything seemed to work normally and there were no visible problems.

+++ b/core/modules/aggregator/aggregator.pages.incundefined
@@ -586,10 +597,22 @@ function template_preprocess_aggregator_summary_item(&$variables) {
+    $variables['source_image'] = l($image, $feed->link->value, array('html' => TRUE, 'attributes' => array('class' =>
+                                                                                                      'feed-image')));

This should just be on one line

dibs!

I fixed it (I think).

dibs on review

Aggregator is working like we expect. I added a news feed and everything was working. Nice job Adam!

And nice job on the review azinoman!

Committed 58c54c3 and pushed to 8.x. Thanks!

I found 2 instances left in 2 files

What if instead of #markup + drupal_render() we just use #theme?

$build['pager'] = array('#theme' => 'pager');

Looks good to me!

I think it may be more appropriate to do this in #2046881: [meta] Avoid "early rendered" strings where beneficial to do so, build structured data to pass to drupal_render() once instead but at some point return drupal_render($build) will most likely need to become just return $build

Committed and pushed to 8.x. Thanks!