<!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>[35498] trunk: Responsive images:</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/35498">35498</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/35498","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-11-04 00:21:23 +0000 (Wed, 04 Nov 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'>Responsive images:
- Fix `_wp_upload_dir_baseurl()` to cache by blog_id.
- Replace `path_join()` with `trailingslashit()`, it's much faster.
- Rename $image_url to $image_src for consistency (used at about 50 other places).
- Couple of tests fixes.
See <a href="https://core.trac.wordpress.org/ticket/34430">#34430</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2015-11-03 21:35:17 UTC (rev 35497)
+++ trunk/src/wp-includes/media.php 2015-11-04 00:21:23 UTC (rev 35498)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,14 +886,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The base URL, cached.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_upload_dir_baseurl() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- static $baseurl = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ static $baseurl = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $baseurl ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog_id = get_current_blog_id();
+
+ if ( empty( $baseurl[$blog_id] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uploads_dir = wp_upload_dir();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $baseurl = $uploads_dir['baseurl'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $baseurl[$blog_id] = $uploads_dir['baseurl'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $baseurl;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $baseurl[$blog_id];
</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">@@ -945,13 +947,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_url = $image[0];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_src = $image[0];
</ins><span class="cx" style="display: block; padding: 0 10px"> $size_array = array(
</span><span class="cx" style="display: block; padding: 0 10px"> absint( $image[1] ),
</span><span class="cx" style="display: block; padding: 0 10px"> absint( $image[2] )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return wp_calculate_image_srcset( $image_url, $size_array, $image_meta, $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_calculate_image_srcset( $image_src, $size_array, $image_meta, $attachment_id );
</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">@@ -959,13 +961,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $image_name The file name, path, URL, or partial path or URL, of the image being matched.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $image_src The 'src' of the image.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $size_array Array of width and height values in pixels (in that order).
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $attachment_id Optional. The image attachment ID to pass to the filter.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|bool The 'srcset' attribute value. False on error or when only one source exists.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_calculate_image_srcset( $image_name, $size_array, $image_meta, $attachment_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_calculate_image_srcset( $image_src, $size_array, $image_meta, $attachment_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $image_meta['sizes'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -981,20 +983,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><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">+ $image_basename = wp_basename( $image_meta['file'] );
+ $image_baseurl = _wp_upload_dir_baseurl();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add full size to the '$image_sizes' array.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_sizes['full'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'width' => $image_meta['width'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'height' => $image_meta['height'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => wp_basename( $image_meta['file'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => $image_basename,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_baseurl = _wp_upload_dir_baseurl();
- $dirname = dirname( $image_meta['file'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Uploads are (or have been) in year/month sub-directories.
+ if ( $image_basename !== $image_meta['file'] ) {
+ $dirname = dirname( $image_meta['file'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $dirname !== '.' ) {
- $image_baseurl = path_join( $image_baseurl, $dirname );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $dirname !== '.' ) {
+ $image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
+ }
</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">+ $image_baseurl = trailingslashit( $image_baseurl );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Calculate the image aspect ratio.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_ratio = $image_height / $image_width;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1003,7 +1012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * contain a unique hash. Look for that hash and use it later to filter
</span><span class="cx" style="display: block; padding: 0 10px"> * out images that are leftovers from previous versions.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_edited = preg_match( '/-e[0-9]{13}/', $image_name, $image_edit_hash );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_edited = preg_match( '/-e[0-9]{13}/', wp_basename( $image_src ), $image_edit_hash );
</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"> * Filter the maximum image width to be included in a 'srcset' attribute.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1034,8 +1043,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $candidate_url = $image['file'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Calculate the new image ratio.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $image['width'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_ratio_compare = $image['height'] / $image['width'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1044,10 +1051,10 @@
</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"> // If the new ratio differs by less than 0.01, use it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( abs( $image_ratio - $image_ratio_compare ) < 0.01 && ! array_key_exists( $candidate_url, $sources ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( abs( $image_ratio - $image_ratio_compare ) < 0.01 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the URL, descriptor, and value to the sources array to be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> $sources[ $image['width'] ] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'url' => path_join( $image_baseurl, $candidate_url ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => $image_baseurl . $image['file'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'descriptor' => 'w',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => $image['width'],
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1100,11 +1107,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $image_meta Optional. The image meta data as returned by 'wp_get_attachment_metadata()'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $attachment_id Optional. Image attachment ID. Either `$image_meta` or `$attachment_id` is needed
</span><span class="cx" style="display: block; padding: 0 10px"> * when using the image size name as argument for `$size`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $image_url Optional. The URL to the image file.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $image_src Optional. The URL to the image file.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|bool A valid source size value for use in a 'sizes' attribute or false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_get_attachment_image_sizes( $size, $image_meta = null, $attachment_id = 0, $image_url = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_get_attachment_image_sizes( $size, $image_meta = null, $attachment_id = 0, $image_src = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $width = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $size ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1139,9 +1146,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * values in pixels (in that order).
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $image_meta The image meta data as returned by 'wp_get_attachment_metadata()'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $attachment_id Image attachment ID of the original image.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $image_url Optional. The URL to the image file.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $image_src Optional. The URL to the image file.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'wp_get_attachment_image_sizes', $sizes, $size, $image_meta, $attachment_id, $image_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'wp_get_attachment_image_sizes', $sizes, $size, $image_meta, $attachment_id, $image_src );
</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></pre></div>
<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-03 21:35:17 UTC (rev 35497)
+++ trunk/tests/phpunit/tests/media.php 2015-11-04 00:21:23 UTC (rev 35498)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -785,10 +785,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sizes as $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $size_array = $this->_get_image_size_array_from_name( $size );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_url = wp_get_attachment_image_url( self::$large_id, $size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_url = wp_get_attachment_image_url( $id, $size );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, wp_calculate_image_srcset( $image_url, $size_array, $image_meta ) );
</span><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">+ // Remove the attachment
+ wp_delete_attachment( $id );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Leave the uploads option the way you found it.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'uploads_use_yearmonth_folders', $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">@@ -800,14 +803,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // For this test we're going to mock metadata changes from an edit.
</span><span class="cx" style="display: block; padding: 0 10px"> // Start by getting the attachment metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = wp_get_attachment_metadata( self::$large_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $image_url = wp_get_attachment_image_url( self::$large_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_url = wp_get_attachment_image_url( self::$large_id, 'medium' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $size_array = $this->_get_image_size_array_from_name( 'medium' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Copy hash generation method used in wp_save_image().
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = 'e' . time() . rand(100, 999);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filename_base = basename( $image_meta['file'], '.png' );
+
+ // Add the hash to the image URL
+ $image_url = str_replace( $filename_base, $filename_base . '-' . $hash, $image_url );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Replace file paths for full and medium sizes with hashed versions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filename_base = basename( $image_meta['file'], '.png' );
</del><span class="cx" style="display: block; padding: 0 10px"> $image_meta['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['file'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta['sizes']['medium']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['medium']['file'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta['sizes']['medium_large']['file'] = str_replace( $filename_base, $filename_base . '-' . $hash, $image_meta['sizes']['medium_large']['file'] );
</span></span></pre>
</div>
</div>
</body>
</html>