Replace theme() with drupal_render() in image module for theme_image_style()

starting in #CodeSprintUA

tagging

+++ b/core/modules/image/image.moduleundefined
@@ -1002,15 +1002,20 @@ function theme_image_style($variables) {
+    // Width and height
...
+    // Add in the image style name as an HTML class
...
+    ),
+    // Determine the URL for the styled image

Add . at the end of each comment

#5 looks good

yep, Samvel is right...
needs work..

Im preparing the new one as suggested by Samvel and Andypost. Will place new patch soon.

4 tests are broken.

+++ b/core/modules/image/image.moduleundefined
@@ -999,18 +999,33 @@ function theme_image_style($variables) {
-
+  ¶

trailing whitespace

+++ b/core/modules/image/image.moduleundefined
@@ -999,18 +999,33 @@ function theme_image_style($variables) {
+  // Finding all available theme registry variables for image style.
+  $hooks = theme_get_registry(FALSE);

this could be too expensive!!! (memory)

Feel free to re-assign this @alweb if you're still working on this.

Here's a new patch.

I tested this patch by creating an article and uploading an image. Everything went fine. Changing to RTBC.

+++ b/core/modules/image/image.moduleundefined
@@ -900,15 +900,25 @@ function theme_image_style($variables) {
-  $variables['width'] = $dimensions['width'];
-  $variables['height'] = $dimensions['height'];
-
   // Add in the image style name as an HTML class.
   $variables['attributes']['class'][] = 'image-style-' . drupal_html_class($variables['style_name']);
 
-  // Determine the URL for the styled image.
-  $variables['uri'] = image_style_url($variables['style_name'], $variables['uri']);
-  return theme('image', $variables);
+  $image = array(
+    '#theme' => 'image',
+    '#width' => $dimensions['width'],
+    '#height' => $dimensions['height'],
+    '#attributes' => $variables['attributes'],
+    '#uri' => image_style_url($variables['style_name'], $variables['uri']),
+  );
+
+  if (isset($variables['alt'])) {
+    $image['#alt'] = $variables['alt'];
+  }
+  if (isset($variables['title'])) {
+    $image['#title'] = $variables['title'];
+  }
+

Why are we making so many changes here? We seem to be fixing things as well... if so we need tests and to change the title...

This issue should just convert the theme call to drupal_render and a follow up should be filed if there is a bug.

There's no bug, it just takes many lines of code in this instance to change theme() to drupal_render() because every variable going to drupal_render() has to be declared explicitly.

$image is the array going to drupal_render(), and every variable previously being passed to theme() through the $variables array needs to be transferred explicitly to $image.

@pplantinga can you just reroll one more time? remove these lines:

+
+  if (isset($variables['alt'])) {
+    $image['#alt'] = $variables['alt'];
+  }
+  if (isset($variables['title'])) {
+    $image['#title'] = $variables['title'];
+  }
+

@jenlampton actually reading @pplantinga comment makes me realise I'm wrong and he is right.

It's the problem with arrays of doom :) ... $variables sucks...

Committed e5b7fb4 and pushed to 8.x. Thanks!