Changeset 9123

Timestamp:

11/04/2014 08:17:51 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Use bp_update_user_meta() in bp_update_user_last_activity() to ensure bp_get_user_meta_key filter is ran.

Fixes bug causing last_activity meta to not be prefixed, and includes testcase.

Fixes #5988.

Location:

trunk

Files:

• src/bp-members/bp-members-functions.php (modified) (1 diff)
• tests/phpunit/testcases/members/functions.php (modified) (1 diff)

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

@@ -974 +974 @@
     remove_filter( 'update_user_metadata', '_bp_update_user_meta_last_activity_warning', 10, 4 );
     remove_filter( 'get_user_metadata', '_bp_get_user_meta_last_activity_warning', 10, 3 );
-    update_user_meta( $user_id, 'last_activity', $time );
+    bp_update_user_meta( $user_id, 'last_activity', $time );
     add_filter( 'update_user_metadata', '_bp_update_user_meta_last_activity_warning', 10, 4 );
     add_filter( 'get_user_metadata', '_bp_get_user_meta_last_activity_warning', 10, 3 );

trunk/tests/phpunit/testcases/members/functions.php

@@ -412 +412 @@
         $this->assertSame( NULL, bp_core_get_userid_from_nicename( 'non_existent_user' ) );
     }
+
+    /**
+     * @group bp_update_user_last_activity
+     */
+    public function test_bp_last_activity_multi_network() {
+
+        // Filter the usermeta key
+        add_filter( 'bp_get_user_meta_key', array( $this, 'filter_usermeta_key' ) );
+
+        // We explicitly do not want last_activity created, so use the
+        // WP factory methods
+        $user = $this->factory->user->create();
+        $time = date( 'Y-m-d H:i:s', time() - 50 );
+
+        // Update last user activity
+        bp_update_user_last_activity( $user, $time );
+
+        // Setup parameters to assert to be the same
+        $expected = $time;
+        $found    = bp_get_user_meta( $user, 'last_activity', true );
+
+        $this->assertSame( $expected, $found );
+    }
+
+    /**
+     * @group bp_update_user_last_activity
+     * @global object $wpdb
+     * @param  string $key
+     * @return string
+     */
+    public function filter_usermeta_key( $key ) {
+        global $wpdb;
+        return $wpdb->prefix . $key;
+    }
 }