Changeset 28008

Timestamp:

04/07/2014 09:24:02 PM (11 years ago)

Author:

nacin

Message:

Gallery Views: Avoid JS errors when image attachments lack metadata.

props gcorne.
fixes #27691.

Location:

trunk/src/wp-includes

Files:

• js/mce-view.js (modified) (1 diff)
• media-template.php (modified) (1 diff)

trunk/src/wp-includes/js/mce-view.js

@@ -290 +290 @@
 
                     _.each( attachments, function( attachment ) {
-                        if ( attachment.sizes.thumbnail ) {
-                            attachment.thumbnail = attachment.sizes.thumbnail;
-                        } else {
-                            attachment.thumbnail = attachment.sizes.full;
+                        if ( attachment.sizes ) {
+                            if ( attachment.sizes.thumbnail ) {
+                                attachment.thumbnail = attachment.sizes.thumbnail;
+                            } else if ( attachment.sizes.full ) {
+                                attachment.thumbnail = attachment.sizes.full;
+                            }
                         }
                     } );

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

@@ -976 +976 @@
                     <dl class="gallery-item">
                         <dt class="gallery-icon">
-                            <img src="{{{ attachment.thumbnail.url }}}" width="{{ attachment.thumbnail.width }}" height="{{ attachment.thumbnail.height }}" />
+                            <# if ( attachment.thumbnail ) { #>
+                                <img src="{{ attachment.thumbnail.url }}" width="{{ attachment.thumbnail.width }}" height="{{ attachment.thumbnail.height }}" />
+                            <# } else { #>
+                                <img src="{{ attachment.url }}" />
+                            <# } #>
                         </dt>
                         <dd class="wp-caption-text gallery-caption">