<!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>[44153] trunk: Meta: Allow empty strings to be set by Custom Fields meta box.</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 { white-space: pre-line; 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/44153">44153</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/44153","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-14 03:16:56 +0000 (Fri, 14 Dec 2018)</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'>Meta: Allow empty strings to be set by Custom Fields meta box.
Because the REST API allows meta keys to have empty values, the Custom Fields meta box should permit the same behavior.
Props charlestonsw, soulseekah, danielbachhuber.
Merges <a href="https://core.trac.wordpress.org/changeset/43811">[43811]</a> to trunk.
Fixes <a href="https://core.trac.wordpress.org/ticket/43559">#43559</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunktestsphpunittestsadminincludesPostphp">trunk/tests/phpunit/tests/admin/includesPost.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsajaxAddMetaphp">trunk/tests/phpunit/tests/ajax/AddMeta.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunk">trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: trunk
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- trunk 2018-12-14 02:54:17 UTC (rev 44152)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ trunk 2018-12-14 03:16:56 UTC (rev 44153)
</ins><a id="trunk"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/4.9:43557,43622
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43761-43765,43767-43770,43772,43774-43781,43783,43790-43800,43802,43804-43806,43808-43809,43821,43842,43860,43869-43876,43892,43904,43909,43926-43929,43954,43956,43961-43963
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43751-43754,43758,43761-43765,43767-43770,43772,43774-43781,43783,43790-43800,43802,43804-43806,43808-43809,43811,43821,43842,43860,43869-43876,43892,43904,43909,43926-43929,43954,43956,43961-43963
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2018-12-14 02:54:17 UTC (rev 44152)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2018-12-14 03:16:56 UTC (rev 44153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1443,9 +1443,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == trim( $key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Please provide a custom field name.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == trim( $value ) ) {
- wp_die( __( 'Please provide a custom field value.' ) );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! $meta = get_metadata_by_mid( 'post', $mid ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 ); // if meta doesn't exist
</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 2018-12-14 02:54:17 UTC (rev 44152)
+++ trunk/src/wp-admin/includes/post.php 2018-12-14 03:16:56 UTC (rev 44153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -867,7 +867,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $metavalue = trim( $metavalue );
</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">- if ( ( '0' === $metavalue || ! empty( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && ! empty( $metakeyselect ) ) || ! empty( $metakeyinput ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ( '#NONE#' != $metakeyselect ) && ! empty( $metakeyselect ) ) || ! empty( $metakeyinput ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * We have a key/value pair. If both the select and the input
</span><span class="cx" style="display: block; padding: 0 10px"> * for the key have data, the input takes precedence.
</span></span></pre></div>
<a id="trunktestsphpunittestsadminincludesPostphp"></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/admin/includesPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/admin/includesPost.php 2018-12-14 02:54:17 UTC (rev 44152)
+++ trunk/tests/phpunit/tests/admin/includesPost.php 2018-12-14 03:16:56 UTC (rev 44153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -799,4 +799,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $name, $blocks );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( array( 'icon' => 'text' ), $blocks[ $name ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 43559
+ */
+ public function test_post_add_meta_empty_is_allowed() {
+ $p = self::factory()->post->create();
+
+ $_POST = array(
+ 'metakeyinput' => 'testkey',
+ 'metavalue' => '',
+ );
+
+ wp_set_current_user( self::$admin_id );
+
+ $this->assertNotFalse( add_meta( $p ) );
+ $this->assertEquals( '', get_post_meta( $p, 'testkey', true ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsajaxAddMetaphpfromrev43811branches50testsphpunittestsajaxAddMetaphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/tests/phpunit/tests/ajax/AddMeta.php (from rev 43811, branches/5.0/tests/phpunit/tests/ajax/AddMeta.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/ajax/AddMeta.php (rev 0)
+++ trunk/tests/phpunit/tests/ajax/AddMeta.php 2018-12-14 03:16:56 UTC (rev 44153)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,71 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * Admin ajax functions to be tested
+ */
+require_once( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+
+/**
+ * Testing Add Meta AJAX functionality.
+ *
+ * @group ajax
+ */
+class Tests_Ajax_AddMeta extends WP_Ajax_UnitTestCase {
+ /**
+ * @ticket 43559
+ */
+ public function test_post_add_meta_empty_is_allowed_ajax() {
+ $p = self::factory()->post->create();
+
+ // Become an administrator.
+ $this->_setRole( 'administrator' );
+
+ $_POST = array(
+ 'post_id' => $p,
+ 'metakeyinput' => 'testkey',
+ 'metavalue' => '',
+ '_ajax_nonce-add-meta' => wp_create_nonce( 'add-meta' ),
+ );
+
+ // Make the request.
+ try {
+ $this->_handleAjax( 'add-meta' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ $this->assertEquals( '', get_post_meta( $p, 'testkey', true ) );
+ }
+
+ /**
+ * @ticket 43559
+ */
+ public function test_post_update_meta_empty_is_allowed_ajax() {
+ $p = self::factory()->post->create();
+
+ $m = add_post_meta( $p, 'testkey', 'hello' );
+
+ // Become an administrator.
+ $this->_setRole( 'administrator' );
+
+ $_POST = array(
+ '_ajax_nonce-add-meta' => wp_create_nonce( 'add-meta' ),
+ 'post_id' => $p,
+ 'meta' => array(
+ $m => array(
+ 'key' => 'testkey',
+ 'value' => '',
+ ),
+ ),
+ );
+
+ // Make the request.
+ try {
+ $this->_handleAjax( 'add-meta' );
+ } catch ( WPAjaxDieContinueException $e ) {
+ unset( $e );
+ }
+
+ $this->assertEquals( '', get_post_meta( $p, 'testkey', true ) );
+ }
+}
</ins></span></pre>
</div>
</div>
</body>
</html>