Ticket #20534: 20534.2.diff

wp-includes/media.php

@@ -605 +605 @@
 function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon = false) {
 
         // get a thumbnail or intermediate image if there is one
-        if ( $image = image_downsize($attachment_id, $size) )
+        if ( $image = image_downsize($attachment_id, $size) ) {
+                if ( force_ssl_admin() && is_admin() ) {
+                        $image = str_replace('http://', 'https://', $image);
+                }
                 return $image;
+        }
 
         $src = false;
 
@@ -616 +620 @@
                 @list($width, $height) = getimagesize($src_file);
         }
         if ( $src && $width && $height )
+                if ( force_ssl_admin() && is_admin() ) {
+                        $src = str_replace('http://', 'https://', $src);
+                }
                 return array( $src, $width, $height );
         return false;
 }