Changeset 12173 for trunk/src/bp-blogs/bp-blogs-functions.php

Timestamp:

06/16/2018 09:37:33 AM (8 years ago)

Author:

djpaul

Message:

Blogs: rename meta table key for compatibilty with ​#WP37923

The WordPress change introduces a blogmeta table in WordPress 5.0.
It uses $wpdb->blogmeta to access the table name, which is what BuddyPress has been using.

This'll be a breaking change for any manual SQL queries as soon as WP 5.0 is released.
When BuddyPress requires 5.0, we can look at migrating table content over, but that is some ways in the future.

Fixes #7834

Props needle, r-a-y

File:

• trunk/src/bp-blogs/bp-blogs-functions.php (modified) (6 diffs)

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

@@ -176 +176 @@
 
                 // Ensure that the cache is clear after the table TRUNCATE above.
-                wp_cache_delete( $blog->blog_id, 'blog_meta' );
+                wp_cache_delete( $blog->blog_id, 'bp_blog_meta' );
 
                 // Get all users.
@@ -1303 +1303 @@
         // 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 ) );
+                $keys = $wpdb->get_col( $wpdb->prepare( "SELECT meta_key FROM {$wpdb->bp_blogmeta} WHERE blog_id = %d", $blog_id ) );
                 $delete_all = false;
         } else {
@@ -1310 +1310 @@
 
         add_filter( 'query', 'bp_filter_metaid_column_name' );
+        add_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
 
         $retval = false;
         foreach ( $keys as $key ) {
-                $retval = delete_metadata( 'blog', $blog_id, $key, $meta_value, $delete_all );
+                $retval = delete_metadata( 'bp_blog', $blog_id, $key, $meta_value, $delete_all );
         }
 
         remove_filter( 'query', 'bp_filter_metaid_column_name' );
+        remove_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
 
         return $retval;
@@ -1339 +1341 @@
 function bp_blogs_get_blogmeta( $blog_id, $meta_key = '', $single = true ) {
         add_filter( 'query', 'bp_filter_metaid_column_name' );
-        $retval = get_metadata( 'blog', $blog_id, $meta_key, $single );
+        add_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
+        $retval = get_metadata( 'bp_blog', $blog_id, $meta_key, $single );
+        remove_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
         remove_filter( 'query', 'bp_filter_metaid_column_name' );
 
@@ -1362 +1366 @@
 function bp_blogs_update_blogmeta( $blog_id, $meta_key, $meta_value, $prev_value = '' ) {
         add_filter( 'query', 'bp_filter_metaid_column_name' );
-        $retval = update_metadata( 'blog', $blog_id, $meta_key, $meta_value, $prev_value );
+        add_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
+        $retval = update_metadata( 'bp_blog', $blog_id, $meta_key, $meta_value, $prev_value );
+        remove_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
         remove_filter( 'query', 'bp_filter_metaid_column_name' );
 
@@ -1383 +1389 @@
 function bp_blogs_add_blogmeta( $blog_id, $meta_key, $meta_value, $unique = false ) {
         add_filter( 'query', 'bp_filter_metaid_column_name' );
-        $retval = add_metadata( 'blog', $blog_id, $meta_key, $meta_value, $unique );
+        add_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
+        $retval = add_metadata( 'bp_blog', $blog_id, $meta_key, $meta_value, $unique );
+        remove_filter( 'sanitize_key', 'bp_blogs_filter_meta_column_name' );
         remove_filter( 'query', 'bp_filter_metaid_column_name' );