<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12659] trunk:
Introduce a single function for getting all the intermediate image sizes to be used both when adding attachements and deleting
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12659">12659</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-01-08 08:51:12 +0000 (Fri, 08 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce a single function for getting all the intermediate image sizes to be used both when adding attachements and deleting. Fixes <a href="http://trac.wordpress.org/ticket/10263">#10263</a> props scribu.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (12658 => 12659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2010-01-08 08:44:45 UTC (rev 12658)
+++ trunk/wp-admin/includes/image.php 2010-01-08 08:51:12 UTC (rev 12659)
</span><span class="lines">@@ -102,13 +102,8 @@
</span><span class="cx">
</span><span class="cx"> // make thumbnails and other intermediate sizes
</span><span class="cx"> global $_wp_additional_image_sizes;
</span><del>- $temp_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
- if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
- $temp_sizes = array_merge( $temp_sizes, array_keys( $_wp_additional_image_sizes ) );
</del><span class="cx">
</span><del>- $temp_sizes = apply_filters( 'intermediate_image_sizes', $temp_sizes );
-
- foreach ( $temp_sizes as $s ) {
</del><ins>+ foreach ( get_intermediate_image_sizes() as $s ) {
</ins><span class="cx"> $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => FALSE );
</span><span class="cx"> if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
</span><span class="cx"> $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (12658 => 12659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-01-08 08:44:45 UTC (rev 12658)
+++ trunk/wp-includes/media.php 2010-01-08 08:51:12 UTC (rev 12659)
</span><span class="lines">@@ -507,6 +507,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Get the available image sizes
+ * @since 3.0
+ * @return array Returns a filtered array of image size strings
+ */
+function get_intermediate_image_sizes() {
+ global $_wp_additional_image_sizes;
+ $image_sizes = array('thumbnail', 'medium', 'large'); // Standard sizes
+ if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
+ $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+
+ return apply_filters( 'intermediate_image_sizes', $image_sizes );
+}
+
+/**
</ins><span class="cx"> * Retrieve an image to represent an attachment.
</span><span class="cx"> *
</span><span class="cx"> * A mime icon for files, thumbnail or intermediate size for images.
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (12658 => 12659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-01-08 08:44:45 UTC (rev 12658)
+++ trunk/wp-includes/post.php 2010-01-08 08:51:12 UTC (rev 12659)
</span><span class="lines">@@ -2946,8 +2946,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // remove intermediate and backup images if there are any
</span><del>- $sizes = apply_filters('intermediate_image_sizes', array('thumbnail', 'medium', 'large'));
- foreach ( $sizes as $size ) {
</del><ins>+ foreach ( get_intermediate_image_sizes() as $size ) {
</ins><span class="cx"> if ( $intermediate = image_get_intermediate_size($post_id, $size) ) {
</span><span class="cx"> $intermediate_file = apply_filters('wp_delete_file', $intermediate['path']);
</span><span class="cx"> @ unlink( path_join($uploadpath['basedir'], $intermediate_file) );
</span></span></pre>
</div>
</div>
</body>
</html>