Changeset 49012

Timestamp:

09/20/2020 01:13:46 PM (6 years ago)

Author:

johnbillion

Message:

Media: Correct the image thumbnail logic in media templates.

This ensures the correct data properties are checked before displaying image thumbnails.

Props chetan200891

Fixes #49655

Location:

trunk/src/wp-includes

Files:

• media-template.php (modified) (2 diffs)
• media.php (modified) (1 diff)

trunk/src/wp-includes/media-template.php

@@ -537 +537 @@
                                 <# if ( data.uploading ) { #>
                                         <div class="media-progress-bar"><div style="width: {{ data.percent }}%"></div></div>
-                                <# } else if ( 'image' === data.type && data.sizes ) { #>
+                                <# } else if ( 'image' === data.type && data.size && data.size.url ) { #>
                                         <div class="centered">
                                                 <img src="{{ data.size.url }}" draggable="false" alt="" />
@@ -599 +599 @@
                                 <# if ( data.uploading ) { #>
                                         <div class="media-progress-bar"><div></div></div>
-                                <# } else if ( 'image' === data.type && data.sizes ) { #>
+                                <# } else if ( 'image' === data.type && data.size && data.size.url ) { #>
                                         <img src="{{ data.size.url }}" draggable="false" alt="" />
                                 <# } else { #>

trunk/src/wp-includes/media.php

@@ -2407 +2407 @@
         ?>
 <script type="text/html" id="tmpl-wp-playlist-current-item">
-        <# if ( data.image ) { #>
-        <img src="{{ data.thumb.src }}" alt="" />
+        <# if ( data.thumb && data.thumb.src ) { #>
+                <img src="{{ data.thumb.src }}" alt="" />
         <# } #>
         <div class="wp-playlist-caption">