Changeset 3911 for branches/plugin/bbp-admin/bbp-tools.php

Timestamp:

05/22/2012 08:00:55 AM (14 years ago)

Author:

johnjamesjacoby

Message:

User Options:

• Introduce bbp-user-options.php to handle all user option related code.
• Add $user_options array to main bbPress class to allow for easy, static, per-user option overrides.
• Tweak action order for option and user_option overrides in bbp-core-hooks.php.
• Replace all appropriate user_meta calls with user_option calls to automatically prefix keys with blog ID.
• Update favorites, subscriptions, and topic/reply count option keys to be per-blog in multisite configurations.
• Fixes #1826.

File:

• branches/plugin/bbp-admin/bbp-tools.php (modified) (4 diffs)

branches/plugin/bbp-admin/bbp-tools.php

@@ -385 +385 @@
                 return array( 1, sprintf( $statement, $result ) );
 
+        $key           = $wpdb->prefix . '_bbp_topic_count';
         $insert_values = array();
         foreach ( $insert_rows as $insert_row )
-                $insert_values[] = "('{$insert_row->post_author}', '_bbp_topic_count', '{$insert_row->_count}')";
+                $insert_values[] = "('{$insert_row->post_author}', '{$key}', '{$insert_row->_count}')";
 
         if ( !count( $insert_values ) )
                 return array( 2, sprintf( $statement, $result ) );
 
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '_bbp_topic_count';";
+        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';";
         if ( is_wp_error( $wpdb->query( $sql_delete ) ) )
                 return array( 3, sprintf( $statement, $result ) );
@@ -431 +432 @@
                 return array( 1, sprintf( $statement, $result ) );
 
+        $key           = $wpdb->prefix . '_bbp_reply_count';
         $insert_values = array();
         foreach ( $insert_rows as $insert_row )
-                $insert_values[] = "('{$insert_row->post_author}', '_bbp_reply_count', '{$insert_row->_count}')";
+                $insert_values[] = "('{$insert_row->post_author}', '{$key}', '{$insert_row->_count}')";
 
         if ( !count( $insert_values ) )
                 return array( 2, sprintf( $statement, $result ) );
 
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '_bbp_reply_count';";
+        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';";
         if ( is_wp_error( $wpdb->query( $sql_delete ) ) )
                 return array( 3, sprintf( $statement, $result ) );
@@ -471 +473 @@
         $statement = __( 'Removing trashed topics from user favorites… %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
-        $key       = bbp_get_favorites_key();
+        $key       = $wpdb->prefix . '_bbp_favorites';
         $users     = $wpdb->get_results( "SELECT `user_id`, `meta_value` AS `favorites` FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';" );
 
@@ -531 +533 @@
         $statement = __( 'Removing trashed topics from user subscriptions… %s', 'bbpress' );
         $result    = __( 'Failed!', 'bbpress' );
-        $key       = bbp_get_subscriptions_key();
+        $key       = $wpdb->prefix . '_bbp_subscriptions';
         $users     = $wpdb->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$wpdb->usermeta}` WHERE `meta_key` = '{$key}';" );