Changeset 7911 for trunk/bp-members/bp-members-functions.php

Timestamp:

02/17/2014 08:27:26 AM (12 years ago)

Author:

r-a-y

Message:

Remove object cache for bp_core_get_user_domain() function.

This caused issues when using a persistent object cache and when the
members directory page slug was changed in the admin area.

Because bp_core_get_user_domain() has its own object cache that is
keyed to each individual user, cache invalidation becomes troublesome.

Since we are already caching the username, this makes caching the
user domain redundant. Thus, this commit removes the object
cache associated with the bp_core_get_user_domain() function, while
leaving the 'bp_core_get_user_domain_pre_cache' filter in place for
backwards compatibility.

Fixes #5402.

File:

• trunk/bp-members/bp-members-functions.php (modified) (1 diff)

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

@@ -125 +125 @@
 function bp_core_get_user_domain( $user_id, $user_nicename = false, $user_login = false ) {
 
-    if ( empty( $user_id ) )
+    if ( empty( $user_id ) ) {
         return;
-
-    if ( !$domain = wp_cache_get( 'bp_user_domain_' . $user_id, 'bp' ) ) {
-        $username = bp_core_get_username( $user_id, $user_nicename, $user_login );
-
-        if ( bp_is_username_compatibility_mode() )
-            $username = rawurlencode( $username );
-
-        $after_domain = bp_core_enable_root_profiles() ? $username : bp_get_members_root_slug() . '/' . $username;
-        $domain       = trailingslashit( bp_get_root_domain() . '/' . $after_domain );
-        $domain       = apply_filters( 'bp_core_get_user_domain_pre_cache', $domain, $user_id, $user_nicename, $user_login );
-
-        // Cache the link
-        if ( !empty( $domain ) ) {
-            wp_cache_set( 'bp_user_domain_' . $user_id, $domain, 'bp' );
-        }
-    }
+    }
+
+    $username = bp_core_get_username( $user_id, $user_nicename, $user_login );
+
+    if ( bp_is_username_compatibility_mode() ) {
+        $username = rawurlencode( $username );
+    }
+
+    $after_domain = bp_core_enable_root_profiles() ? $username : bp_get_members_root_slug() . '/' . $username;
+    $domain       = trailingslashit( bp_get_root_domain() . '/' . $after_domain );
+
+    // Don't use this filter.  Subject to removal in a future release.
+    // Use the 'bp_core_get_user_domain' filter instead.
+    $domain       = apply_filters( 'bp_core_get_user_domain_pre_cache', $domain, $user_id, $user_nicename, $user_login );
 
     return apply_filters( 'bp_core_get_user_domain', $domain, $user_id, $user_nicename, $user_login );