<!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>[27129] trunk: Add remove_image_size() and tests for it and has_image_size(), added in [27128].</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27129">27129</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-02-08 00:40:15 +0000 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add remove_image_size() and tests for it and has_image_size(), added in <a href="http://core.trac.wordpress.org/changeset/27128">[27128]</a>.
props mordauk, markoheijnen.
fixes <a href="http://core.trac.wordpress.org/ticket/26768">#26768</a>. see <a href="http://core.trac.wordpress.org/ticket/26951">#26951</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>Modified: trunk/src/wp-includes/media.php (27128 => 27129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-02-08 00:19:29 UTC (rev 27128)
+++ trunk/src/wp-includes/media.php 2014-02-08 00:40:15 UTC (rev 27129)
</span><span class="lines">@@ -181,30 +181,58 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Registers a new image size
</del><ins>+ * Register a new image size.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><ins>+ *
+ * @param string $name The image size name.
+ * @param int $width The image's width.
+ * @param int $height The image's width.
+ * @param bool $width Whether to crop the image to fit the dimensions. Default false.
</ins><span class="cx"> */
</span><span class="cx"> function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
</span><span class="cx"> global $_wp_additional_image_sizes;
</span><del>- $_wp_additional_image_sizes[$name] = array( 'width' => absint( $width ), 'height' => absint( $height ), 'crop' => (bool) $crop );
</del><ins>+ $_wp_additional_image_sizes[ $name ] = array(
+ 'width' => absint( $width ),
+ 'height' => absint( $height ),
+ 'crop' => (bool) $crop,
+ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Check if an image size exists
</del><ins>+ * Check if an image size exists.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.9.0
</span><span class="cx"> *
</span><del>- * @param string $name The image size name.
</del><ins>+ * @param string $name The image size to check.
</ins><span class="cx"> * @return bool True if it exists, false if not.
</span><span class="cx"> */
</span><span class="cx"> function has_image_size( $name = '' ) {
</span><span class="cx"> global $_wp_additional_image_sizes;
</span><span class="cx">
</span><del>- return isset( $_wp_additional_image_sizes[$name] );
</del><ins>+ return isset( $_wp_additional_image_sizes[ $name ] );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Remove a new image size.
+ *
+ * @since 3.9.0
+ *
+ * @param string $name The image size to remove.
+ * @return bool True on success, false on failure.
+ */
+function remove_image_size( $name ) {
+ global $_wp_additional_image_sizes;
+
+ if ( isset( $_wp_additional_image_sizes[ $name ] ) ) {
+ unset( $_wp_additional_image_sizes[ $name ] );
+ return true;
+ }
+
+ return false;
+}
+
+/**
</ins><span class="cx"> * Registers an image size for the post thumbnail
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/media.php (27128 => 27129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/media.php 2014-02-08 00:19:29 UTC (rev 27128)
+++ trunk/tests/phpunit/tests/media.php 2014-02-08 00:40:15 UTC (rev 27129)
</span><span class="lines">@@ -406,4 +406,35 @@
</span><span class="cx">
</span><span class="cx"> $this->assertEquals( $expected, $content );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * @ticket 26768
+ */
+ function test_add_image_size() {
+ global $_wp_additional_image_sizes;
+ $this->assertArrayNotHasKey( 'test-size', $_wp_additional_image_sizes );
+ add_image_size( 'test-size', 200, 600 );
+ $this->assertArrayHasKey( 'test-size', $_wp_additional_image_sizes );
+ $this->assertEquals( 200, $_wp_additional_image_sizes['test-size']['width'] );
+ $this->assertEquals( 600, $_wp_additional_image_sizes['test-size']['height'] );
+ }
+
+ /**
+ * @ticket 26768
+ */
+ function test_remove_image_size() {
+ add_image_size( 'test-size', 200, 600 );
+ $this->assertTrue( has_image_size( 'test-size' ) );
+ remove_image_size( 'test-size' );
+ $this->assertFalse( has_image_size( 'test-size' ) );
+ }
+
+ /**
+ * @ticket 26951
+ */
+ function test_has_image_size() {
+ add_image_size( 'test-size', 200, 600 );
+ $this->assertTrue( has_image_size( 'test-size' ) );
+ }
+
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>