Replace theme() with drupal_render() in file module

attached

#3 works for me
rtbc

Are you sure? Because seems i try this, and it not workink, because drupal_render(which will render $table) will not render anythinh in #rows.

Yeah, I shouldn't write patches at 1:00 at night. :) I'll have another look at this tomorrow.

Some improvements and fixes now that I am awake.

needed a reroll

I see one of the problems here:

@@ -957,16 +960,17 @@ function file_managed_file_process($element, &$form_state, $form) {
   if (!empty($fids) && $element['#files']) {
     foreach ($element['#files'] as $delta => $file) {
       if ($element['#multiple']) {
+        $file_link = array(
+          '#theme' => 'file_link',
+          '#file' => $file,
+        );
         $element['file_' . $delta]['selected'] = array(
           '#type' => 'checkbox',
-          '#title' => theme('file_link', array('file' => $file)) . ' ',
+          '#title' => drupal_render($file_link),
         );
       }
       else {
-        $element['file_' . $delta]['filename'] = array(
-          '#markup' => theme('file_link', array('file' => $file)) . ' ',
-          '#weight' => -10,
-        );
+        $element['file_' . $delta]['filename'] = $file_link += array('#weight' => -10);
       }
     }
   }

I also have doubts about this part:

+++ b/core/modules/file/lib/Drupal/file/Plugin/views/field/FileMime.php
@@ -36,8 +36,11 @@ public function buildOptionsForm(&$form, &$form_state) {
   function render($values) {
     $data = $values->{$this->field_alias};
     if (!empty($this->options['filemime_image']) && $data !== NULL && $data !== '') {
-      $fake_file = (object) array('filemime' => $data);
-      $data = theme('file_icon', array('file' => $fake_file));
+      $file_icon = array(
+        '#theme' => 'file_icon',
+        '#file' => $values->_entity,
+      );
+      $data = drupal_render($file_icon);
     }

But I am letting this part be as it seems it was working fine in #15 (at least tests passed).

I am repeating the following change for theme_image_widget() which should fix those exceptions.

+++ b/core/modules/file/file.field.inc
@@ -596,7 +596,7 @@ function theme_file_widget($variables) {
   if (!empty($element['fids']['#value'])) {
     // Add the file size after the file name.
     $file = reset($element['#files']);
-    $element['file_' . $file->id()]['filename']['#markup'] .= ' <span class="file-size">(' . format_size($file->getSize()) . ')</span> ';
+    $element['file_' . $file->id()]['filename']['#suffix'] = ' <span class="file-size">(' . format_size($file->getSize()) . ')</span> ';
   }
   $output .= drupal_render_children($element);

Interdiff is attached for clarity.

I think this needs a reroll

@ErikV:

Why do you say it needs a reroll? The patch applies cleanly locally. I will ask the testbot for its opinion.

#23: drupal-file-2009014-23.patch queued for re-testing.

#23: drupal-file-2009014-23.patch queued for re-testing.

Tagging for reroll.

It looks as though #2036087: Add public identifier to all render methods in all views plugins in core (commit 31efff2) conflicts. I feel like living dangerously, so I will manually edit the patch, adding "public" in the one context line that matches "function render". My patch applies cleanly, but what will the testbot say?

I applied the patch and tested it. It worked well.

I also manually tested.

Attached are screen shots of Field Icon and File Upload Field.

RTBC.

Committed bc65847 and pushed to 8.x. Thanks!

The patch worked! There were no apparent issues when I uploaded a file in an article.

#36: drupal-file-2009014-36.patch queued for re-testing.

Committed and pushed to 8.x. Thanks!

Had to revert this commit because the commit contained changes from #2052995: Add a route to the frontpage see f4aead7

Committed 9614f73 and pushed to 8.x.

Committed 8b7bc0c and pushed to 8.x. Thanks!

D'oh. Sorry about that!