Changeset 8130

Timestamp:

03/14/2014 12:15:41 AM (11 years ago)

Author:

boonebgorges

Message:

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 #5399

Location:

trunk

Files:

• bp-activity/bp-activity-functions.php (modified) (1 diff)
• bp-blogs/bp-blogs-functions.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-functions.php (modified) (1 diff)
• tests/testcases/activity/functions.php (modified) (1 diff)
• tests/testcases/blogs/functions.php (modified) (1 diff)
• tests/testcases/xprofile/functions.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-functions.php

@@ -576 +576 @@
         return false;
     }
-
-    // Legacy - Trim off whitespace
-    $meta_value = trim( $meta_value );
 
     // Legacy - if no meta_key is passed, delete all for the item

trunk/bp-blogs/bp-blogs-functions.php

@@ -862 +862 @@
     }
 
-    // Legacy - trim meta_value
-    $meta_value = trim( $meta_value );
-
     add_filter( 'query', 'bp_filter_metaid_column_name' );
 

trunk/bp-xprofile/bp-xprofile-functions.php

@@ -601 +601 @@
     }
 
-    // Legacy - trim meta_value
-    $meta_value = trim( $meta_value );
-
     add_filter( 'query', 'bp_filter_metaid_column_name' );
     add_filter( 'query', 'bp_xprofile_filter_meta_query' );

trunk/tests/testcases/activity/functions.php

@@ -330 +330 @@
      * @group activitymeta
      * @group bp_activity_delete_meta
+     * @ticket BP5399
      */
     public function test_bp_activity_delete_meta_trim_meta_value() {
-        // @todo Wtf?
         $a = $this->factory->activity->create();
         bp_activity_update_meta( $a, 'foo', 'bar' );
-        $this->assertTrue( bp_activity_delete_meta( $a, 'foo', ' bar ' ) );
-        $this->assertFalse( bp_activity_get_meta( $a, 'foo' ) );
+        bp_activity_delete_meta( $a, 'foo', ' bar ' );
+        $this->assertSame( 'bar', bp_activity_get_meta( $a, 'foo' ) );
     }
 

trunk/tests/testcases/blogs/functions.php

@@ -29 +29 @@
      * @group blogmeta
      * @group bp_blogs_delete_blogmeta
+     * @ticket BP5399
      */
     public function test_bp_blogs_delete_blogmeta_trim_meta_value() {
         $this->assertTrue( bp_blogs_update_blogmeta( 1, 'foo', 'bar' ) );
         $this->assertSame( 'bar', bp_blogs_get_blogmeta( 1, 'foo' ) );
-        $this->assertTrue( bp_blogs_delete_blogmeta( 1, 'foo', '   bar  ') );
-        $this->assertSame( '', bp_blogs_get_blogmeta( 1, 'foo' ) );
+        bp_blogs_delete_blogmeta( 1, 'foo', '   bar  ' );
+        $this->assertSame( 'bar', bp_blogs_get_blogmeta( 1, 'foo' ) );
     }
 

trunk/tests/testcases/xprofile/functions.php

@@ -201 +201 @@
      * @group xprofilemeta
      * @group bp_xprofile_delete_meta
+     * @ticket BP5399
      */
     public function test_bp_xprofile_delete_meta_trim_meta_value() {
@@ -207 +208 @@
         $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
 
-        $this->assertTrue( bp_xprofile_delete_meta( $g, 'group', 'foo', ' bar  ' ) );
-        $this->assertEquals( '', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
+        bp_xprofile_delete_meta( $g, 'group', 'foo', ' bar  ' );
+        $this->assertSame( 'bar', bp_xprofile_get_meta( $g, 'group', 'foo' ) );
     }