Changeset 6697 for trunk/bp-core/bp-core-template.php

Timestamp:

12/31/2012 02:20:16 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Remove static speed-ups in bp_displayed_user_id() and bp_loggedin_user_id(). Causing issues with unit tests by not being clearable.

File:

• trunk/bp-core/bp-core-template.php (modified) (2 diffs)

trunk/bp-core/bp-core-template.php

@@ -770 +770 @@
  */
 function bp_displayed_user_id() {
-
-    static $id = 0;
-
-    if ( empty( $id ) ) {
-        global $bp;
-        $id = !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0;
-    }
-
-    return apply_filters( 'bp_displayed_user_id', $id );
+    $bp = buddypress();
+    $id = !empty( $bp->displayed_user->id ) ? $bp->displayed_user->id : 0;
+
+    return (int) apply_filters( 'bp_displayed_user_id', $id );
 }
 
@@ -788 +783 @@
  */
 function bp_loggedin_user_id() {
-
-    static $id = 0;
-
-    if ( empty( $id ) ) {
-        global $bp;
-        $id = !empty( $bp->loggedin_user->id ) ? $bp->loggedin_user->id : 0;
-    }
-
-    return apply_filters( 'bp_loggedin_user_id', $id );
+    $bp = buddypress();
+    $id = !empty( $bp->loggedin_user->id ) ? $bp->loggedin_user->id : 0;
+
+    return (int) apply_filters( 'bp_loggedin_user_id', $id );
 }