Changeset 37988 for trunk/src/wp-includes/theme-compat/embed-content.php

Timestamp:

07/06/2016 05:07:19 PM (8 years ago)

Author:

ocean90

Message:

Embeds: Don't print the HTML for a featured image if a post has no featured image.

See [36693].
Fixes #37288.

File:

• trunk/src/wp-includes/theme-compat/embed-content.php (modified) (2 diffs)

trunk/src/wp-includes/theme-compat/embed-content.php

@@ -23 +23 @@
         }
 
-        $aspect_ratio = 1;
-        $measurements = array( 1, 1 );
-        $image_size   = 'full'; // Fallback.
+        if ( $thumbnail_id ) {
+            $aspect_ratio = 1;
+            $measurements = array( 1, 1 );
+            $image_size   = 'full'; // Fallback.
 
-        $meta = wp_get_attachment_metadata( $thumbnail_id );
-        if ( ! empty( $meta['sizes'] ) ) {
-            foreach ( $meta['sizes'] as $size => $data ) {
-                if ( $data['width'] / $data['height'] > $aspect_ratio ) {
-                    $aspect_ratio = $data['width'] / $data['height'];
-                    $measurements = array( $data['width'], $data['height'] );
-                    $image_size   = $size;
+            $meta = wp_get_attachment_metadata( $thumbnail_id );
+            if ( ! empty( $meta['sizes'] ) ) {
+                foreach ( $meta['sizes'] as $size => $data ) {
+                    if ( $data['width'] / $data['height'] > $aspect_ratio ) {
+                        $aspect_ratio = $data['width'] / $data['height'];
+                        $measurements = array( $data['width'], $data['height'] );
+                        $image_size   = $size;
+                    }
                 }
             }
+
+            /**
+             * Filters the thumbnail image size for use in the embed template.
+             *
+             * @since 4.4.0
+             * @since 4.5.0 Added `$thumbnail_id` parameter.
+             *
+             * @param string $image_size   Thumbnail image size.
+             * @param int    $thumbnail_id Attachment ID.
+             */
+            $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size, $thumbnail_id );
+
+            $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
+
+            /**
+             * Filters the thumbnail shape for use in the embed template.
+             *
+             * Rectangular images are shown above the title while square images
+             * are shown next to the content.
+             *
+             * @since 4.4.0
+             * @since 4.5.0 Added `$thumbnail_id` parameter.
+             *
+             * @param string $shape        Thumbnail image shape. Either 'rectangular' or 'square'.
+             * @param int    $thumbnail_id Attachment ID.
+             */
+            $shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id );
         }
 
-        /**
-         * Filters the thumbnail image size for use in the embed template.
-         *
-         * @since 4.4.0
-         * @since 4.5.0 Added `$thumbnail_id` parameter.
-         *
-         * @param string $image_size   Thumbnail image size.
-         * @param int    $thumbnail_id Attachment ID.
-         */
-        $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size, $thumbnail_id );
-
-        $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
-
-        /**
-         * Filters the thumbnail shape for use in the embed template.
-         *
-         * Rectangular images are shown above the title while square images
-         * are shown next to the content.
-         *
-         * @since 4.4.0
-         * @since 4.5.0 Added `$thumbnail_id` parameter.
-         *
-         * @param string $shape        Thumbnail image shape. Either 'rectangular' or 'square'.
-         * @param int    $thumbnail_id Attachment ID.
-         */
-        $shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id );
-
-        if ( 'rectangular' === $shape ) : ?>
+        if ( $thumbnail_id && 'rectangular' === $shape ) : ?>
             <div class="wp-embed-featured-image rectangular">
                 <a href="<?php the_permalink(); ?>" target="_top">
@@ -79 +81 @@
         </p>
 
-        <?php if ( 'square' === $shape ) : ?>
+        <?php if ( $thumbnail_id && 'square' === $shape ) : ?>
             <div class="wp-embed-featured-image square">
                 <a href="<?php the_permalink(); ?>" target="_top">