Changeset 4488

Timestamp:

06/12/2011 12:04:50 PM (14 years ago)

Author:

djpaul

Message:

Set is_item_admin/is_item_mod in core component, not members. Fixes #3262

Location:

trunk

Files:

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

trunk/bp-core/bp-core-loader.php

@@ -161 +161 @@
         $bp->core->table_name_notifications = $bp->table_prefix . 'bp_notifications';
 
+        /**
+         * Used to determine if user has admin rights on current content. If the
+         * logged in user is viewing their own profile and wants to delete
+         * something, is_item_admin is used. This is a generic variable so it
+         * can be used by other components. It can also be modified, so when
+         * viewing a group 'is_item_admin' would be 'true' if they are a group
+         * admin, and 'false' if they are not.
+         */
+        bp_update_is_item_admin( bp_user_has_access(), 'core' );
+
+        // Is the logged in user is a mod for the current item?
+        bp_update_is_item_mod( false,                  'core' );
+
         do_action( 'bp_core_setup_globals' );
     }

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

@@ -696 +696 @@
 }
 
+function bp_user_has_access() {
+    $has_access = ( is_super_admin() || bp_is_my_profile() ) ? true : false;
+
+    return apply_filters( 'bp_user_has_access', $has_access );
+}
+
 /** is_() functions to determine the current page *****************************/
 

trunk/bp-members/bp-members-loader.php

@@ -86 +86 @@
         // The core userdata of the user who is currently logged in.
         $bp->loggedin_user->userdata       = bp_core_get_core_userdata( $bp->loggedin_user->id );
-
-        /**
-         * Used to determine if user has admin rights on current content. If the
-         * logged in user is viewing their own profile and wants to delete
-         * something, is_item_admin is used. This is a generic variable so it
-         * can be used by other components. It can also be modified, so when
-         * viewing a group 'is_item_admin' would be 'true' if they are a group
-         * admin, and 'false' if they are not.
-         */
-        bp_update_is_item_admin( bp_user_has_access(), 'members' );
-
-        // Is the logged in user is a mod for the current item?
-        bp_update_is_item_mod  ( false,                'members' );
 
         /** Displayed user ****************************************************/

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

@@ -755 +755 @@
         return apply_filters( 'bp_get_last_activity', $last_activity );
     }   
-
-function bp_user_has_access() {
-    $has_access = ( is_super_admin() || bp_is_my_profile() ) ? true : false;
-
-    return apply_filters( 'bp_user_has_access', $has_access );
-}
 
 function bp_user_firstname() {