<!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>[BuddyPress][8130] trunk: Don't trim whitespace from $meta_value param in _delete_meta() functions</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://buddypress.trac.wordpress.org/changeset/8130">8130</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-03-14 00:15:41 +0000 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't trim whitespace from $meta_value param in _delete_meta() functions
The $meta_value parameter of BP's delete_meta() functions allows developers to
limit deletion to rows that match both the $meta_key *and* the specified
$meta_value. However, most of BP's delete_meta() functions have always had a
quirk whereby the $meta_value was run through trim() before matching against
the values in the database. This had the unacceptable side effect that passing
a $meta_value of ' foo ' would delete rows with the value 'foo', but *not*
the value ' foo '!
This changeset reverses the behavior, and modifies the relevant unit tests.
See <a href="http://buddypress.trac.wordpress.org/ticket/5399">#5399</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilefunctionsphp">trunk/bp-xprofile/bp-xprofile-functions.php</a></li>
<li><a href="#trunkteststestcasesactivityfunctionsphp">trunk/tests/testcases/activity/functions.php</a></li>
<li><a href="#trunkteststestcasesblogsfunctionsphp">trunk/tests/testcases/blogs/functions.php</a></li>
<li><a href="#trunkteststestcasesxprofilefunctionsphp">trunk/tests/testcases/xprofile/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (8129 => 8130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2014-03-14 00:07:18 UTC (rev 8129)
+++ trunk/bp-activity/bp-activity-functions.php 2014-03-14 00:15:41 UTC (rev 8130)
</span><span class="lines">@@ -576,9 +576,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Legacy - Trim off whitespace
- $meta_value = trim( $meta_value );
-
</del><span class="cx"> // Legacy - if no meta_key is passed, delete all for the item
</span><span class="cx"> if ( empty( $meta_key ) ) {
</span><span class="cx"> $all_meta = bp_activity_get_meta( $activity_id );
</span></span></pre></div>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (8129 => 8130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2014-03-14 00:07:18 UTC (rev 8129)
+++ trunk/bp-blogs/bp-blogs-functions.php 2014-03-14 00:15:41 UTC (rev 8130)
</span><span class="lines">@@ -861,9 +861,6 @@
</span><span class="cx"> $keys = array( $meta_key );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Legacy - trim meta_value
- $meta_value = trim( $meta_value );
-
</del><span class="cx"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx">
</span><span class="cx"> foreach ( $keys as $key ) {
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-functions.php (8129 => 8130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-functions.php 2014-03-14 00:07:18 UTC (rev 8129)
+++ trunk/bp-xprofile/bp-xprofile-functions.php 2014-03-14 00:15:41 UTC (rev 8130)
</span><span class="lines">@@ -600,9 +600,6 @@
</span><span class="cx"> $keys = array( $meta_key );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Legacy - trim meta_value
- $meta_value = trim( $meta_value );
-
</del><span class="cx"> add_filter( 'query', 'bp_filter_metaid_column_name' );
</span><span class="cx"> add_filter( 'query', 'bp_xprofile_filter_meta_query' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkteststestcasesactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/activity/functions.php (8129 => 8130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/activity/functions.php 2014-03-14 00:07:18 UTC (rev 8129)
+++ trunk/tests/testcases/activity/functions.php 2014-03-14 00:15:41 UTC (rev 8130)
</span><span class="lines">@@ -329,13 +329,13 @@
</span><span class="cx"> /**
</span><span class="cx"> * @group activitymeta
</span><span class="cx"> * @group bp_activity_delete_meta
</span><ins>+ * @ticket BP5399
</ins><span class="cx"> */
</span><span class="cx"> public function test_bp_activity_delete_meta_trim_meta_value() {
</span><del>- // @todo Wtf?
</del><span class="cx"> $a = $this->factory->activity->create();
</span><span class="cx"> bp_activity_update_meta( $a, 'foo', 'bar' );
</span><del>- $this->assertTrue( bp_activity_delete_meta( $a, 'foo', ' bar ' ) );
- $this->assertFalse( bp_activity_get_meta( $a, 'foo' ) );
</del><ins>+ bp_activity_delete_meta( $a, 'foo', ' bar ' );
+ $this->assertSame( 'bar', bp_activity_get_meta( $a, 'foo' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkteststestcasesblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/blogs/functions.php (8129 => 8130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/blogs/functions.php 2014-03-14 00:07:18 UTC (rev 8129)
+++ trunk/tests/testcases/blogs/functions.php 2014-03-14 00:15:41 UTC (rev 8130)
</span><span class="lines">@@ -28,12 +28,13 @@
</span><span class="cx"> /**
</span><span class="cx"> * @group blogmeta
</span><span class="cx"> * @group bp_blogs_delete_blogmeta
</span><ins>+ * @ticket BP5399
</ins><span class="cx"> */
</span><span class="cx"> public function test_bp_blogs_delete_blogmeta_trim_meta_value() {
</span><span class="cx"> $this->assertTrue( bp_blogs_update_blogmeta( 1, 'foo', 'bar' ) );
</span><span class="cx"> $this->assertSame( 'bar', bp_blogs_get_blogmeta( 1, 'foo' ) );
</span><del>- $this->assertTrue( bp_blogs_delete_blogmeta( 1, 'foo', ' bar ') );
- $this->assertSame( '', bp_blogs_get_blogmeta( 1, 'foo' ) );
</del><ins>+ bp_blogs_delete_blogmeta( 1, 'foo', ' bar ' );
+ $this->assertSame( 'bar', bp_blogs_get_blogmeta( 1, 'foo' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkteststestcasesxprofilefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/xprofile/functions.php (8129 => 8130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/xprofile/functions.php 2014-03-14 00:07:18 UTC (rev 8129)
+++ trunk/tests/testcases/xprofile/functions.php 2014-03-14 00:15:41 UTC (rev 8130)
</span><span class="lines">@@ -200,14 +200,15 @@
</span><span class="cx"> /**
</span><span class="cx"> * @group xprofilemeta
</span><span class="cx"> * @group bp_xprofile_delete_meta
</span><ins>+ * @ticket BP5399
</ins><span class="cx"> */
</span><span class="cx"> public function test_bp_xprofile_delete_meta_trim_meta_value() {
</span><span class="cx"> $g = $this->factory->xprofile_group->create();
</span><span class="cx"> bp_xprofile_update_meta( $g, 'group', 'foo', 'bar' );
</span><span class="cx"> $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
</span><span class="cx">
</span><del>- $this->assertTrue( bp_xprofile_delete_meta( $g, 'group', 'foo', ' bar ' ) );
- $this->assertEquals( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
</del><ins>+ bp_xprofile_delete_meta( $g, 'group', 'foo', ' bar ' );
+ $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>