<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[35751] trunk/tests/phpunit/tests/media.php: Unit Tests: fix responsive image unit tests.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/35751">35751</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/35751","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-12-01 20:44:54 +0000 (Tue, 01 Dec 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Unit Tests: fix responsive image unit tests. Correct the logic in video shortcode unit test for width.
Props joemcgill, wonderboymusic.
Fixes <a href="https://core.trac.wordpress.org/ticket/34790">#34790</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2015-11-30 09:50:56 UTC (rev 35750)
+++ trunk/tests/phpunit/tests/media.php 2015-12-01 20:44:54 UTC (rev 35751)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,10 +425,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $width = 720;
</span><span class="cx" style="display: block; padding: 0 10px"> $height = 480;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $w = empty( $GLOBALS['content_width'] ) ? 640 : $GLOBALS['content_width'];
+ if ( $width > $w ) {
+ $width = $w;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = get_post() ? get_the_ID() : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $video =<<<VIDEO
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-[video width="720" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+[video width="$width" height="480" mp4="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4"]
</ins><span class="cx" style="display: block; padding: 0 10px"> <!-- WebM/VP8 for Firefox4, Opera, and Chrome -->
</span><span class="cx" style="display: block; padding: 0 10px"> <source type="video/webm" src="myvideo.webm" />
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- Ogg/Vorbis for older Firefox and Opera versions -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,14 +445,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> [/video]
</span><span class="cx" style="display: block; padding: 0 10px"> VIDEO;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $w = empty( $GLOBALS['content_width'] ) ? 640 : $GLOBALS['content_width'];
- $h = ceil( ( $height * $w ) / $width );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $h = ceil( ( $height * $width ) / $width );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'the_content', $video );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = '<div style="width: ' . $w . 'px; " class="wp-video">' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = '<div style="width: ' . $width . 'px; " class="wp-video">' .
</ins><span class="cx" style="display: block; padding: 0 10px"> "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n" .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<video class="wp-video-shortcode" id="video-' . $post_id . '-1" width="' . $w . '" height="' . $h . '" preload="metadata" controls="controls">' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<video class="wp-video-shortcode" id="video-' . $post_id . '-1" width="' . $width . '" height="' . $h . '" preload="metadata" controls="controls">' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<source type="video/mp4" src="http://domain.tld/wp-content/uploads/2013/12/xyz.mp4?_=1" />' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<!-- WebM/VP8 for Firefox4, Opera, and Chrome --><source type="video/webm" src="myvideo.webm" />' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<!-- Ogg/Vorbis for older Firefox and Opera versions --><source type="video/ogg" src="myvideo.ogv" />' .
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -739,29 +744,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_calculate_image_srcset() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $_wp_additional_image_sizes;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $year_month = date('Y/m');
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $uploads_dir_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = $uploads_dir_url . $year_month . '/' . $image_meta['sizes']['medium']['file'] . ' ' . $image_meta['sizes']['medium']['width'] . 'w, ' .
- $uploads_dir_url . $year_month . '/' . $image_meta['sizes']['medium_large']['file'] . ' ' . $image_meta['sizes']['medium_large']['width'] . 'w, ' .
- $uploads_dir_url . $year_month . '/' . $image_meta['sizes']['large']['file'] . ' ' . $image_meta['sizes']['large']['width'] . 'w, ' .
- $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Set up test cases for all expected size names.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = array( 'medium', 'medium_large', 'large', 'full' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $intermediates = array( 'medium', 'medium_large', 'large', 'full' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $sizes as $size ) {
- $image_url = wp_get_attachment_image_url( self::$large_id, $size );
- $size_array = $this->_get_image_size_array_from_name( $size );
- $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add any soft crop intermediate sizes.
+ foreach ( $_wp_additional_image_sizes as $name => $additional_size ) {
+ if ( ! $_wp_additional_image_sizes[$name]['crop'] || 0 === $_wp_additional_image_sizes[$name]['height'] ) {
+ $intermediates[] = $name;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $expected = "";
+
+ foreach( $image_meta['sizes'] as $name => $size ) {
+ // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
+ if ( in_array( $name, $intermediates ) ) {
+ $expected .= $uploads_dir_url . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
+ }
+ }
+
+ // Add the full size width at the end.
+ $expected .= $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] .'w';
+
+ foreach ( $intermediates as $int ) {
+ $image_url = wp_get_attachment_image_url( self::$large_id, $int );
+ $size_array = $this->_get_image_size_array_from_name( $int );
+ $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_calculate_image_srcset_no_date_uploads() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $_wp_additional_image_sizes;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Save the current setting for uploads folders
</span><span class="cx" style="display: block; padding: 0 10px"> $uploads_use_yearmonth_folders = get_option( 'uploads_use_yearmonth_folders' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,20 +798,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $uploads_dir_url = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = $uploads_dir_url . $image_meta['sizes']['medium']['file'] . ' ' . $image_meta['sizes']['medium']['width'] . 'w, ' .
- $uploads_dir_url . $image_meta['sizes']['medium_large']['file'] . ' ' . $image_meta['sizes']['medium_large']['width'] . 'w, ' .
- $uploads_dir_url . $image_meta['sizes']['large']['file'] . ' ' . $image_meta['sizes']['large']['width'] . 'w, ' .
- $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] . 'w';
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Set up test cases for all expected size names.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = array( 'medium', 'medium_large', 'large', 'full' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $intermediates = array( 'medium', 'medium_large', 'large', 'full' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $sizes as $size ) {
- $size_array = $this->_get_image_size_array_from_name( $size );
- $image_url = wp_get_attachment_image_url( $id, $size );
- $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $_wp_additional_image_sizes as $name => $additional_size ) {
+ if ( ! $_wp_additional_image_sizes[$name]['crop'] || 0 === $_wp_additional_image_sizes[$name]['height'] ) {
+ $intermediates[] = $name;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = "";
+
+ foreach( $image_meta['sizes'] as $name => $size ) {
+ // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
+ if ( in_array( $name, $intermediates ) ) {
+ $expected .= $uploads_dir_url . $size['file'] . ' ' . $size['width'] . 'w, ';
+ }
+ }
+
+ // Add the full size width at the end.
+ $expected .= $uploads_dir_url . $image_meta['file'] . ' ' . $image_meta['width'] .'w';
+
+ foreach ( $intermediates as $int ) {
+ $size_array = $this->_get_image_size_array_from_name( $int );
+ $image_url = wp_get_attachment_image_url( $id, $int );
+ $this->assertSame( $expected, wp_calculate_image_srcset( $size_array, $image_url, $image_meta ) );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove the attachment
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_attachment( $id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -859,22 +895,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_srcset() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $_wp_additional_image_sizes;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $size_array = array( 1600, 1200 ); // full size
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $srcset = wp_get_attachment_image_srcset( self::$large_id, $size_array, $image_meta );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $year_month = date('Y/m');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads_dir = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year_month = date('Y/m') . '/'
- . $image_meta['sizes']['medium']['file'] . ' ' . $image_meta['sizes']['medium']['width'] . 'w, ';
- $expected .= 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year_month = date('Y/m') . '/'
- . $image_meta['sizes']['medium_large']['file'] . ' ' . $image_meta['sizes']['medium_large']['width'] . 'w, ';
- $expected .= 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $year_month = date('Y/m') . '/'
- . $image_meta['sizes']['large']['file'] . ' ' . $image_meta['sizes']['large']['width'] . 'w, ';
- $expected .= 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . $image_meta['file'] . ' ' . $image_meta['width'] .'w';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set up test cases for all expected size names.
+ $intermediates = array( 'medium', 'medium_large', 'large', 'full' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $expected, $srcset );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $_wp_additional_image_sizes as $name => $additional_size ) {
+ if ( ! $_wp_additional_image_sizes[$name]['crop'] || 0 === $_wp_additional_image_sizes[$name]['height'] ) {
+ $intermediates[] = $name;
+ }
+ }
+
+ $expected = "";
+
+ foreach( $image_meta['sizes'] as $name => $size ) {
+ // Whitelist the sizes that should be included so we pick up 'medium_large' in 4.4.
+ if ( in_array( $name, $intermediates ) ) {
+ $expected .= $uploads_dir . $year_month . '/' . $size['file'] . ' ' . $size['width'] . 'w, ';
+ }
+ }
+
+ $expected .= $uploads_dir . $image_meta['file'] . ' ' . $image_meta['width'] .'w';
+
+ $this->assertSame( $expected, $srcset );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,12 +963,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 33641
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_get_attachment_image_sizes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Test sizes against the default WP sizes.
- $intermediates = array('thumbnail', 'medium', 'medium_large', 'large');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test sizes against the default WP sizes.
+ $intermediates = array('thumbnail', 'medium', 'medium_large', 'large');
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $intermediates as $int_size ) {
- $image = wp_get_attachment_image_src( self::$large_id, $int_size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure themes aren't filtering the sizes array.
+ remove_all_filters( 'wp_calculate_image_sizes' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach( $intermediates as $int_size ) {
+ $image = wp_get_attachment_image_src( self::$large_id, $int_size );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $expected = '(max-width: ' . $image[1] . 'px) 100vw, ' . $image[1] . 'px';
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = wp_get_attachment_image_sizes( self::$large_id, $int_size );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -930,11 +984,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_calculate_image_sizes() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Test sizes against the default WP sizes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $intermediates = array('thumbnail', 'medium', 'medium_large', 'large');
- $image_meta = wp_get_attachment_metadata( self::$large_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $intermediates = array('thumbnail', 'medium', 'medium_large', 'large');
+ $image_meta = wp_get_attachment_metadata( self::$large_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $intermediates as $int_size ) {
- $size_array = $this->_get_image_size_array_from_name( $int_size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Make sure themes aren't filtering the sizes array.
+ remove_all_filters( 'wp_calculate_image_sizes' );
+
+ foreach( $intermediates as $int_size ) {
+ $size_array = $this->_get_image_size_array_from_name( $int_size );
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_src = $image_meta['sizes'][$int_size]['file'];
</span><span class="cx" style="display: block; padding: 0 10px"> list( $width, $height ) = $size_array;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>