Changeset 6249

Timestamp:

08/08/2012 05:13:00 PM (12 years ago)

Author:

boonebgorges

Message:

Moves bp_displayed_user_id() and bp_loggedin_user_id() to Core component

The function bp_displayed_user_id() and bp_loggedin_user_id() are referenced
throughout BuddyPress's Core component when doing things like checking page
type. In certain circumstances, these checks might happen after the Core
component is loaded, but before the Members component is loaded. For this
reason, it's important that the functions live in Core rather than Members,
to avoid fatal errors.

Fixes #4403

Props steve7777

Location:

trunk

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)

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

@@ -752 +752 @@
     }
 
+/**
+ * Get the id of the currently displayed user
+ *
+ * @uses apply_filters() Filter 'bp_displayed_user_id' to change this value
+ * @return int
+ */
+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 );
+}
+
+/**
+ * Get the id of the currently logged-in user
+ *
+ * @uses apply_filters() Filter 'bp_loggedin_user_id' to change this value
+ * @return int
+ */
+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 );
+}
+
 /** is_() functions to determine the current page *****************************/
 

trunk/bp-members/bp-members-template.php

@@ -863 +863 @@
     }
     function bp_user_link() { bp_displayed_user_domain(); } // Deprecated.
-
-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 );
-}
-
-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 );
-}
 
 function bp_current_user_id() { return bp_displayed_user_id(); }