Changeset 1459

Timestamp:

03/27/2015 09:59:39 PM (11 years ago)

Author:

coffee2code

Message:

Profiles Activity Handler: Also change the meta table name via 'bp_activity_meta_tables' filter and future-proof table name overriding.

File:

• sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php (modified) (2 diffs)

sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php

@@ -36 +36 @@
                  */
                 public function __construct() {
-                        add_filter( 'bp_activity_global_tables', array( $this, 'change_table_names' ) );
+                        add_filter( 'bp_activity_global_tables', array( $this, 'change_global_table_names' ) );
+                        add_filter( 'bp_activity_meta_tables',   array( $this, 'change_meta_table_names' ) );
                         add_filter( 'bp_active_components',      array( $this, 'activate_activity_component' ) );
                         add_action( 'plugins_loaded',            array( $this, 'plugins_loaded' ) );
@@ -60 +61 @@
                  * @return array
                  */
-                public function change_table_names( $tables ) {
+                public function change_global_table_names( $tables ) {
                         global $bp;
 
-                        return array(
-                                'table_name'      => $bp->table_prefix . 'wporg_activity',
-                                'table_name_meta' => $bp->table_prefix . 'wporg_activity_meta',
-                        );
+                        $tables['table_name']      = $bp->table_prefix . 'wporg_activity';
+                        $tables['table_name_meta'] = $bp->table_prefix . 'wporg_activity_meta';
+
+                        return $tables;
+                }
+
+                /**
+                 * Changes the meta table name to use custom wporg activity meta tables rather
+                 * than the ones for BuddyPress.org.
+                 *
+                 * @param  array $tables The default meta table.
+                 * @return array
+                 */
+                public function change_meta_table_names( $tables ) {
+                        global $bp;
+
+                        $tables['activity'] = $bp->table_prefix . 'wporg_activity_meta';
+
+                        return $tables;
                 }