← Back to branch summary

~canonical-sysadmins/wordpress/4.8.1

« back to all changes in this revision

Viewing changes to wp-includes/theme-compat/embed-content.php

  • Committer: Barry Price
  • Date: 2016-08-17 04:49:28 UTC
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: barry.price@canonical.com-20160817044928-viijiwb4tl8jwzmp
new upstream release 4.6

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/theme-compat/embed-content.php
22
22
                        $thumbnail_id = get_the_ID();
23
23
                }
24
24
 
25
 
                $aspect_ratio = 1;
26
 
                $measurements = array( 1, 1 );
27
 
                $image_size   = 'full'; // Fallback.
 
25
                if ( $thumbnail_id ) {
 
26
                        $aspect_ratio = 1;
 
27
                        $measurements = array( 1, 1 );
 
28
                        $image_size   = 'full'; // Fallback.
28
29
 
29
 
                $meta = wp_get_attachment_metadata( $thumbnail_id );
30
 
                if ( ! empty( $meta['sizes'] ) ) {
31
 
                        foreach ( $meta['sizes'] as $size => $data ) {
32
 
                                if ( $data['width'] / $data['height'] > $aspect_ratio ) {
33
 
                                        $aspect_ratio = $data['width'] / $data['height'];
34
 
                                        $measurements = array( $data['width'], $data['height'] );
35
 
                                        $image_size   = $size;
 
30
                        $meta = wp_get_attachment_metadata( $thumbnail_id );
 
31
                        if ( ! empty( $meta['sizes'] ) ) {
 
32
                                foreach ( $meta['sizes'] as $size => $data ) {
 
33
                                        if ( $data['width'] / $data['height'] > $aspect_ratio ) {
 
34
                                                $aspect_ratio = $data['width'] / $data['height'];
 
35
                                                $measurements = array( $data['width'], $data['height'] );
 
36
                                                $image_size   = $size;
 
37
                                        }
36
38
                                }
37
39
                        }
 
40
 
 
41
                        /**
 
42
                         * Filters the thumbnail image size for use in the embed template.
 
43
                         *
 
44
                         * @since 4.4.0
 
45
                         * @since 4.5.0 Added `$thumbnail_id` parameter.
 
46
                         *
 
47
                         * @param string $image_size   Thumbnail image size.
 
48
                         * @param int    $thumbnail_id Attachment ID.
 
49
                         */
 
50
                        $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size, $thumbnail_id );
 
51
 
 
52
                        $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
 
53
 
 
54
                        /**
 
55
                         * Filters the thumbnail shape for use in the embed template.
 
56
                         *
 
57
                         * Rectangular images are shown above the title while square images
 
58
                         * are shown next to the content.
 
59
                         *
 
60
                         * @since 4.4.0
 
61
                         * @since 4.5.0 Added `$thumbnail_id` parameter.
 
62
                         *
 
63
                         * @param string $shape        Thumbnail image shape. Either 'rectangular' or 'square'.
 
64
                         * @param int    $thumbnail_id Attachment ID.
 
65
                         */
 
66
                        $shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id );
38
67
                }
39
68
 
40
 
                /**
41
 
                 * Filter the thumbnail image size for use in the embed template.
42
 
                 *
43
 
                 * @since 4.4.0
44
 
                 * @since 4.5.0 Added `$thumbnail_id` parameter.
45
 
                 *
46
 
                 * @param string $image_size   Thumbnail image size.
47
 
                 * @param int    $thumbnail_id Attachment ID.
48
 
                 */
49
 
                $image_size = apply_filters( 'embed_thumbnail_image_size', $image_size, $thumbnail_id );
50
 
 
51
 
                $shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
52
 
 
53
 
                /**
54
 
                 * Filter the thumbnail shape for use in the embed template.
55
 
                 *
56
 
                 * Rectangular images are shown above the title while square images
57
 
                 * are shown next to the content.
58
 
                 *
59
 
                 * @since 4.4.0
60
 
                 * @since 4.5.0 Added `$thumbnail_id` parameter.
61
 
                 *
62
 
                 * @param string $shape        Thumbnail image shape. Either 'rectangular' or 'square'.
63
 
                 * @param int    $thumbnail_id Attachment ID.
64
 
                 */
65
 
                $shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id );
66
 
 
67
 
                if ( 'rectangular' === $shape ) : ?>
 
69
                if ( $thumbnail_id && 'rectangular' === $shape ) : ?>
68
70
                        <div class="wp-embed-featured-image rectangular">
69
71
                                <a href="<?php the_permalink(); ?>" target="_top">
70
72
                                        <?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?>
78
80
                        </a>
79
81
                </p>
80
82
 
81
 
                <?php if ( 'square' === $shape ) : ?>
 
83
                <?php if ( $thumbnail_id && 'square' === $shape ) : ?>
82
84
                        <div class="wp-embed-featured-image square">
83
85
                                <a href="<?php the_permalink(); ?>" target="_top">
84
86
                                        <?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?>
90
92
 
91
93
                <?php
92
94
                /**
93
 
                 * Print additional content after the embed excerpt.
 
95
                 * Prints additional content after the embed excerpt.
94
96
                 *
95
97
                 * @since 4.4.0
96
98
                 */
103
105
                        <div class="wp-embed-meta">
104
106
                                <?php
105
107
                                /**
106
 
                                 * Print additional meta content in the embed template.
 
108
                                 * Prints additional meta content in the embed template.
107
109
                                 *
108
110
                                 * @since 4.4.0
109
111
                                 */