Changeset 8135

Timestamp:

03/14/2014 01:12:13 AM (12 years ago)

Author:

boonebgorges

Message:

Remove unnecessary parameter sanitization from meta functions

WP's meta API functions already perform the necessary sanitization.

See #5399

Location:

trunk

Files:

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

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

@@ -572 +572 @@
         global $wpdb, $bp;
 
-        // Legacy - Return false if any of the above values are not set
-        if ( ! is_numeric( $activity_id ) ) {
-                return false;
-        }
-
         // Legacy - if no meta_key is passed, delete all for the item
         if ( empty( $meta_key ) ) {
@@ -616 +611 @@
  */
 function bp_activity_get_meta( $activity_id = 0, $meta_key = '', $single = true ) {
-
-        // Make sure activity_id is valid
-        if ( empty( $activity_id ) || ! is_numeric( $activity_id ) ) {
-                return false;
-        }
-
         add_filter( 'query', 'bp_filter_metaid_column_name' );
         $retval = get_metadata( 'activity', $activity_id, $meta_key, $single );
@@ -647 +636 @@
  */
 function bp_activity_update_meta( $activity_id, $meta_key, $meta_value, $prev_value = '' ) {
-
-        // Legacy - Make sure activity_id is valid
-        if ( ! is_numeric( $activity_id ) ) {
-                return false;
-        }
-
         add_filter( 'query', 'bp_filter_metaid_column_name' );
         $retval = update_metadata( 'activity', $activity_id, $meta_key, $meta_value, $prev_value );

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

@@ -849 +849 @@
         global $wpdb, $bp;
 
-        // Legacy - return false if the $blog_id is empty
-        if ( ! is_numeric( $blog_id ) ) {
-                return false;
-        }
-
         // Legacy - if no meta_key is passed, delete all for the blog_id
         if ( empty( $meta_key ) ) {
@@ -864 +859 @@
         add_filter( 'query', 'bp_filter_metaid_column_name' );
 
+        $retval = false;
         foreach ( $keys as $key ) {
                 $retval = delete_metadata( 'blog', $blog_id, $key, $meta_value, $delete_all );

trunk/bp-groups/bp-groups-functions.php

@@ -1033 +1033 @@
         global $wpdb;
 
-        // Legacy - return false if non-int group ID
-        if ( ! is_numeric( $group_id ) ) {
-                return false;
-        }
-
         // Legacy - if no meta_key is passed, delete all for the item
         if ( empty( $meta_key ) ) {

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

@@ -579 +579 @@
         global $wpdb;
 
-        // Legacy - no empty object id
-        if ( empty( $object_id ) ) {
-                return false;
-        }
-
-        // Legacy - sanitize object type
+        // Sanitize object type
         if ( ! in_array( $object_type, array( 'group', 'field', 'data' ) ) ) {
                 return false;
@@ -604 +599 @@
         add_filter( 'query', 'bp_xprofile_filter_meta_query' );
 
+        $retval = false;
         foreach ( $keys as $key ) {
                 $retval = delete_metadata( 'xprofile_' . $object_type, $object_id, $key, $meta_value, $delete_all );
@@ -630 +626 @@
  */
 function bp_xprofile_get_meta( $object_id, $object_type, $meta_key = '', $single = true ) {
-        // Legacy - sanitize object type
+        // Sanitize object type
         if ( ! in_array( $object_type, array( 'group', 'field', 'data' ) ) ) {
                 return false;