Ticket #34109: 34109.diff

src/wp-includes/media.php

@@ -766 +766 @@
                         $image = array( $src, $width, $height );
                 }
         }
+
+        // Force HTTPS schemes in the admin when force_ssl_admin() is true.
+        if ( $image && is_admin() && force_ssl_admin() ) {
+                $image[0] = set_url_scheme( $image[0], 'https' );
+        }
+
         /**
          * Filter the image src result.
          *

tests/phpunit/tests/media.php

@@ -1133 +1133 @@
                 // Intermediate sized GIFs should not include the full size in the srcset.
                 $this->assertFalse( strpos( wp_calculate_image_srcset( $size_array, $large_src, $image_meta ), $full_src ) );
         }
+
+        /**
+         * @ticket 34109
+         */
+        function test_wp_get_attachment_image_src_https_admin() {
+                // Save our starting setup.
+                $force_ssl_admin = force_ssl_admin();
+                $curent_screen = get_current_screen();
+
+                force_ssl_admin( true );
+                set_current_screen( 'dashboard' );
+
+                $image = wp_get_attachment_image_src( self::$large_id );
+
+                $this->assertSame( $image[0], set_url_scheme( $image[0], 'https' ) );
+
+                // Leave things as we found them.
+                force_ssl_admin( $force_ssl_admin );
+                $GLOBALS['current_screen'] = $curent_screen;
+        }
 }