<!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>[38303] trunk/src: Media: add a function, `wp_get_additional_image_sizes()`, that wraps the retrieval of the global `$_wp_additional_image_sizes`.</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/38303">38303</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/38303","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>2016-08-22 04:36:42 +0000 (Mon, 22 Aug 2016)</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'>Media: add a function, `wp_get_additional_image_sizes()`, that wraps the retrieval of the global `$_wp_additional_image_sizes`. Removes 6 global imports.
See <a href="https://core.trac.wordpress.org/ticket/37699">#37699</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2016-08-22 04:16:29 UTC (rev 38302)
+++ trunk/src/wp-admin/includes/image-edit.php 2016-08-22 04:36:42 UTC (rev 38303)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -700,13 +700,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Saves image to post along with enqueued changes
</span><span class="cx" style="display: block; padding: 0 10px"> * in $_REQUEST['history']
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global array $_wp_additional_image_sizes
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @return \stdClass
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_save_image( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $_wp_additional_image_sizes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $return = new stdClass;
</span><span class="cx" style="display: block; padding: 0 10px"> $success = $delete = $scaled = $nocrop = false;
</span></span></pre></div>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2016-08-22 04:16:29 UTC (rev 38302)
+++ trunk/src/wp-admin/includes/image.php 2016-08-22 04:36:42 UTC (rev 38303)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,8 +67,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.1.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">- * @global array $_wp_additional_image_sizes
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $attachment_id Attachment Id to process.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $file Filepath of the Attached image.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Metadata for attachment.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,23 +85,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata['file'] = _wp_relative_upload_path($file);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make thumbnails and other intermediate sizes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $_wp_additional_image_sizes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_intermediate_image_sizes() as $s ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes[$s] = array( 'width' => '', 'height' => '', 'crop' => false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_wp_additional_image_sizes[$s]['width'] ) )
- $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] ); // For theme-added sizes
- else
- $sizes[$s]['width'] = get_option( "{$s}_size_w" ); // For default sizes set in options
- if ( isset( $_wp_additional_image_sizes[$s]['height'] ) )
- $sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] ); // For theme-added sizes
- else
- $sizes[$s]['height'] = get_option( "{$s}_size_h" ); // For default sizes set in options
- if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) )
- $sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop']; // For theme-added sizes
- else
- $sizes[$s]['crop'] = get_option( "{$s}_crop" ); // For default sizes set in options
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_wp_additional_image_sizes[$s]['width'] ) ) {
+ // For theme-added sizes
+ $sizes[$s]['width'] = intval( $_wp_additional_image_sizes[$s]['width'] );
+ } else {
+ // For default sizes set in options
+ $sizes[$s]['width'] = get_option( "{$s}_size_w" );
+ }
+
+ if ( isset( $_wp_additional_image_sizes[$s]['height'] ) ) {
+ // For theme-added sizes
+ $sizes[$s]['height'] = intval( $_wp_additional_image_sizes[$s]['height'] );
+ } else {
+ // For default sizes set in options
+ $sizes[$s]['height'] = get_option( "{$s}_size_h" );
+ }
+
+ if ( isset( $_wp_additional_image_sizes[$s]['crop'] ) ) {
+ // For theme-added sizes
+ $sizes[$s]['crop'] = $_wp_additional_image_sizes[$s]['crop'];
+ } else {
+ // For default sizes set in options
+ $sizes[$s]['crop'] = get_option( "{$s}_crop" );
+ }
</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="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2016-08-22 04:16:29 UTC (rev 38302)
+++ trunk/src/wp-admin/includes/post.php 2016-08-22 04:36:42 UTC (rev 38303)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1367,14 +1367,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.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">- * @global array $_wp_additional_image_sizes
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param int $thumbnail_id ID of the attachment used for thumbnail
</span><span class="cx" style="display: block; padding: 0 10px"> * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string html
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $_wp_additional_image_sizes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $post->post_type );
</span></span></pre></div>
<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 2016-08-22 04:16:29 UTC (rev 38302)
+++ trunk/src/wp-includes/media.php 2016-08-22 04:36:42 UTC (rev 38303)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,6 +7,23 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Retrieve additional image sizes.
+ *
+ * @since 4.7.0
+ *
+ * @global array $_wp_additional_image_sizes
+ *
+ * @return array Additional images size data.
+ */
+function wp_get_additional_image_sizes() {
+ global $_wp_additional_image_sizes;
+ if ( ! $_wp_additional_image_sizes ) {
+ $_wp_additional_image_sizes = array();
+ }
+ return $_wp_additional_image_sizes;
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Scale down the default size of an image.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * This is so that the image is a better fit for the editor and theme.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +44,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $content_width
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global array $_wp_additional_image_sizes
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $width Width of the image in pixels.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $height Height of the image in pixels.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,8 +55,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Width and height of what the result image should resize to.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $content_width, $_wp_additional_image_sizes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $content_width;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_wp_additional_image_sizes = wp_get_additional_image_sizes();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $context )
</span><span class="cx" style="display: block; padding: 0 10px"> $context = is_admin() ? 'edit' : 'display';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,11 +100,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( intval($content_width) > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_width = min( intval($content_width), $max_width );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
- $max_width = min( intval($content_width), $max_width );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Only in admin. Assume that theme authors know what they're doing.
+ if ( intval( $content_width ) > 0 && 'edit' === $context ) {
+ $max_width = min( intval( $content_width ), $max_width );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // $size == 'full' has no constraint
</span><span class="cx" style="display: block; padding: 0 10px"> else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,15 +278,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.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">- * @global array $_wp_additional_image_sizes
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @param string $name The image size to check.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if the image size exists, false if not.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function has_image_size( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $_wp_additional_image_sizes;
-
- return isset( $_wp_additional_image_sizes[ $name ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = wp_get_additional_image_sizes();
+ return isset( $sizes[ $name ] );
</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">@@ -748,15 +765,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.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">- * @global array $_wp_additional_image_sizes
- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array Returns a filtered array of image size strings.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_intermediate_image_sizes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $_wp_additional_image_sizes;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_wp_additional_image_sizes ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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"> * Filters the list of intermediate image sizes.
</span></span></pre>
</div>
</div>
</body>
</html>