Changeset 7870

Timestamp:

02/14/2014 01:43:39 AM (13 years ago)

Author:

boonebgorges

Message:

Migrate blogmeta functions to the WP metadata API

See #4551

Location:

trunk/bp-blogs

Files:

• bp-blogs-functions.php (modified) (3 diffs)
• bp-blogs-loader.php (modified) (2 diffs)

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

@@ -840 +840 @@
         global $wpdb, $bp;
 
-        if ( !is_numeric( $blog_id ) )
-                return false;
-
-        $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
-
-        if ( is_array($meta_value) || is_object($meta_value) )
-                $meta_value = serialize($meta_value);
-
+        // Legacy - return false if the $blog_id is empty
+        if ( ! is_numeric( $blog_id ) ) {
+                return false;
+        }
+
+        // Legacy - sanitize meta_key
+        $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
+
+        // Legacy - if no meta_key is passed, delete all for the blog_id
+        if ( empty( $meta_key ) ) {
+                $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->blogmeta} WHERE blog_id = %d", $blog_id ) );
+        } else {
+                $keys = array( $meta_key );
+        }
+
+        // Legacy - trim meta_value
         $meta_value = trim( $meta_value );
 
-        if ( !$meta_key )
-                $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id ) );
-        else if ( $meta_value )
-                $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s AND meta_value = %s", $blog_id, $meta_key, $meta_value ) );
-        else
-                $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
-
-        wp_cache_delete( 'bp_blogs_blogmeta_' . $blog_id . '_' . $meta_key, 'bp' );
-
-        return true;
+        add_filter( 'query', 'bp_filter_metaid_column_name' );
+
+        foreach ( $keys as $key ) {
+                $retval = delete_metadata( 'blog', $blog_id, $key, $meta_value );
+        }
+
+        remove_filter( 'query', 'bp_filter_metaid_column_name' );
+
+        return $retval;
 }
 
@@ -877 +884 @@
  */
 function bp_blogs_get_blogmeta( $blog_id, $meta_key = '') {
-        global $wpdb, $bp;
-
-        $blog_id = (int) $blog_id;
-
-        if ( !$blog_id )
-                return false;
-
-        if ( !empty($meta_key) ) {
-                $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
-
-                if ( !$metas = wp_cache_get( 'bp_blogs_blogmeta_' . $blog_id . '_' . $meta_key, 'bp' ) ) {
-                        $metas = $wpdb->get_col( $wpdb->prepare( "SELECT meta_value FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
-                        wp_cache_set( 'bp_blogs_blogmeta_' . $blog_id . '_' . $meta_key, $metas, 'bp' );
+
+        // Legacy - Sanitize meta_key
+        $meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
+
+        add_filter( 'query', 'bp_filter_metaid_column_name' );
+        $retval = get_metadata( 'blog', $blog_id, $meta_key, true );
+        remove_filter( 'query', 'bp_filter_metaid_column_name' );
+
+        // Legacy - If no meta_key is passed, return only the found values,
+        // not a structured array
+        if ( empty( $meta_key ) && is_array( $retval ) ) {
+                $values = array();
+                foreach ( $retval as $value ) {
+                        $values[] = array_pop( $value );
                 }
-        } else {
-                $metas = $wpdb->get_col( $wpdb->prepare("SELECT meta_value FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d", $blog_id ) );
-        }
-
-        if ( empty($metas) ) {
-                if ( empty($meta_key) )
-                        return array();
-                else
-                        return '';
-        }
-
-        $metas = array_map('maybe_unserialize', (array) $metas);
-
-        if ( 1 == count($metas) )
-                return $metas[0];
-        else
-                return $metas;
+                $retval = $values;
+        }
+
+        return $retval;
 }
 
@@ -922 +917 @@
  */
 function bp_blogs_update_blogmeta( $blog_id, $meta_key, $meta_value ) {
-        global $wpdb, $bp;
-
-        if ( !is_numeric( $blog_id ) )
-                return false;
-
+
+        // Legacy - Sanitize meta_key
         $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
 
-        if ( is_string($meta_value) )
-                $meta_value = stripslashes( $meta_value );
-
-        $meta_value = maybe_serialize($meta_value);
-
-        if (empty( $meta_value ) )
-                return bp_blogs_delete_blogmeta( $blog_id, $meta_key );
-
-        $cur = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name_blogmeta} WHERE blog_id = %d AND meta_key = %s", $blog_id, $meta_key ) );
-
-        if ( !$cur )
-                $wpdb->query( $wpdb->prepare( "INSERT INTO {$bp->blogs->table_name_blogmeta} ( blog_id, meta_key, meta_value ) VALUES ( %d, %s, %s )", $blog_id, $meta_key, $meta_value ) );
-        else if ( $cur->meta_value != $meta_value )
-                $wpdb->query( $wpdb->prepare( "UPDATE {$bp->blogs->table_name_blogmeta} SET meta_value = %s WHERE blog_id = %d AND meta_key = %s", $meta_value, $blog_id, $meta_key ) );
-        else
-                return false;
-
-        wp_cache_set( 'bp_blogs_blogmeta_' . $blog_id . '_' . $meta_key, $meta_value, 'bp' );
-
-        return true;
+        add_filter( 'query', 'bp_filter_metaid_column_name' );
+        $retval = update_metadata( 'blog', $blog_id, $meta_key, $meta_value );
+        remove_filter( 'query', 'bp_filter_metaid_column_name' );
+
+        // Legacy - New items fall through to add_metadata(). Return true
+        // instead of the ID returned from that function.
+        if ( is_int( $retval ) ) {
+                $retval = true;
+        }
+
+        return $retval;
 }
 

trunk/bp-blogs/bp-blogs-loader.php

@@ -53 +53 @@
                         'table_name'          => $bp->table_prefix . 'bp_user_blogs',
                         'table_name_blogmeta' => $bp->table_prefix . 'bp_user_blogs_blogmeta',
+                );
+
+                $meta_tables = array(
+                        'blog' => $bp->table_prefix . 'bp_user_blogs_blogmeta',
                 );
 
@@ -65 +69 @@
                         'autocomplete_all'      => defined( 'BP_MESSAGES_AUTOCOMPLETE_ALL' ),
                         'global_tables'         => $global_tables,
+                        'meta_tables'           => $meta_tables,
                 );