Changeset 3192

Timestamp:

08/15/2010 04:43:07 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Use is_super_admin instead of deprecated is_site_admin

Location:

branches/1.2

Files:

• bp-activity.php (modified) (5 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (2 diffs)
• bp-blogs.php (modified) (1 diff)
• bp-blogs/bp-blogs-classes.php (modified) (5 diffs)
• bp-core.php (modified) (11 diffs)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-filters.php (modified) (1 diff)
• bp-core/bp-core-settings.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-core/bp-core-wpabstraction.php (modified) (1 diff)
• bp-forums.php (modified) (2 diffs)
• bp-forums/bp-forums-templatetags.php (modified) (1 diff)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (8 diffs)
• bp-groups/bp-groups-classes.php (modified) (12 diffs)
• bp-groups/bp-groups-filters.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (3 diffs)
• bp-messages.php (modified) (5 diffs)
• bp-messages/bp-messages-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/ajax.php (modified) (2 diffs)
• bp-themes/bp-default/functions.php (modified) (1 diff)
• bp-themes/bp-default/groups/create.php (modified) (1 diff)
• bp-themes/bp-default/members/single/messages/compose.php (modified) (1 diff)
• bp-xprofile.php (modified) (6 diffs)

branches/1.2/bp-activity.php

@@ -174 +174 @@
                 return false;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 $bp->is_item_admin = false;
 
@@ -187 +187 @@
                 return false;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 $bp->is_item_admin = false;
 
@@ -197 +197 @@
         global $bp;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 $bp->is_item_admin = false;
 
@@ -207 +207 @@
         global $bp;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 $bp->is_item_admin = false;
 
@@ -356 +356 @@
 
         /* Check access */
-        if ( !is_site_admin() && $activity->user_id != $bp->loggedin_user->id )
+        if ( !is_super_admin() && $activity->user_id != $bp->loggedin_user->id )
                 return false;
 

branches/1.2/bp-activity/bp-activity-templatetags.php

@@ -576 +576 @@
 
                 /* Add the delete link if the user has permission on this item */
-                if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || $bp->loggedin_user->is_site_admin )
+                if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || $bp->loggedin_user->is_super_admin )
                          $content .= apply_filters( 'bp_activity_delete_link', ' · ' . bp_get_activity_delete_link(), &$activities_template->activity );
 
@@ -660 +660 @@
 
                                 /* Delete link */
-                                if ( $bp->loggedin_user->is_site_admin || $bp->loggedin_user->id == $comment->user_id )
+                                if ( $bp->loggedin_user->is_super_admin || $bp->loggedin_user->id == $comment->user_id )
                                         $content .= ' &middot; <a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/?cid=' . $comment->id, 'bp_activity_delete_link' ) . '" class="delete acomment-delete">' . __( 'Delete', 'buddypress' ) . '</a>';
 

branches/1.2/bp-blogs.php

@@ -55 +55 @@
 
         /* Only create the bp-blogs tables if this is a multisite install */
-        if ( is_site_admin() && bp_core_is_multisite() ) {
+        if ( is_super_admin() && bp_core_is_multisite() ) {
                 /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
                 if ( get_site_option( 'bp-blogs-db-version' ) < BP_BLOGS_DB_VERSION )

branches/1.2/bp-blogs/bp-blogs-classes.php

@@ -76 +76 @@
                         bp_blogs_setup_globals();
 
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+                if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
                         $hidden_sql = "AND wb.public = 1";
 
@@ -210 +210 @@
 
                 // If the user is logged in return the blog count including their hidden blogs.
-                if ( ( is_user_logged_in() && $user_id == $bp->loggedin_user->id ) || is_site_admin() )
+                if ( ( is_user_logged_in() && $user_id == $bp->loggedin_user->id ) || is_super_admin() )
                         return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id) );
                 else
@@ -224 +224 @@
                 $filter = like_escape( $wpdb->escape( $filter ) );
 
-                if ( !is_site_admin() )
+                if ( !is_super_admin() )
                         $hidden_sql = "AND wb.public = 1";
 
@@ -242 +242 @@
                         bp_blogs_setup_globals();
 
-                if ( !is_site_admin() )
+                if ( !is_super_admin() )
                         $hidden_sql = "AND wb.public = 1";
 
@@ -262 +262 @@
                 $letter = like_escape( $wpdb->escape( $letter ) );
 
-                if ( !is_site_admin() )
+                if ( !is_super_admin() )
                         $hidden_sql = "AND wb.public = 1";
 

branches/1.2/bp-core.php

@@ -107 +107 @@
         $bp->loggedin_user->userdata = bp_core_get_core_userdata( $bp->loggedin_user->id );
 
-        /* is_site_admin() hits the DB on single WP installs, so we need to get this separately so we can call it in a loop. */
-        $bp->loggedin_user->is_site_admin = is_site_admin();
+        /* is_super_admin() hits the DB on single WP installs, so we need to get this separately so we can call it in a loop. */
+        $bp->loggedin_user->is_super_admin = is_super_admin();
 
         /* The user id of the user currently being viewed, set in /bp-core/bp-core-catchuri.php */
@@ -269 +269 @@
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
  * @global $current_user WordPress global variable containing current logged in user information
- * @uses is_site_admin() returns true if the current user is a site admin, false if not
+ * @uses is_super_admin() returns true if the current user is a site admin, false if not
  * @uses get_site_option() fetches the value for a meta_key in the wp_sitemeta table
  * @uses bp_core_install() runs the installation of DB tables for the core component
@@ -276 +276 @@
         global $bp;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 
@@ -294 +294 @@
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses is_site_admin() returns true if the current user is a site admin, false if not
+ * @uses is_super_admin() returns true if the current user is a site admin, false if not
  * @uses add_submenu_page() WP function to add a submenu item
  */
 function bp_core_add_admin_menu() {
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 
@@ -431 +431 @@
         global $bp, $wpdb, $wp_version;
 
-        if ( !is_site_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
+        if ( !is_super_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
                 return false;
 
@@ -499 +499 @@
         global $bp;
 
-        if ( !is_site_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
+        if ( !is_super_admin() || bp_is_my_profile() || !$bp->displayed_user->id )
                 return false;
 
@@ -681 +681 @@
 
         /* If this is for site admins only and the user is not one, don't create the subnav item */
-        if ( $site_admin_only && !is_site_admin() )
+        if ( $site_admin_only && !is_super_admin() )
                 return false;
 
@@ -818 +818 @@
 
         /* If this is for site admins only and the user is not one, don't create the subnav item */
-        if ( $site_admin_only && !is_site_admin() )
+        if ( $site_admin_only && !is_super_admin() )
                 return false;
 
@@ -1715 +1715 @@
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses is_site_admin() Checks to see if the user is a site administrator.
+ * @uses is_super_admin() Checks to see if the user is a site administrator.
  * @uses wpmu_delete_user() Deletes a user from the system on multisite installs.
  * @uses wp_delete_user() Deletes a user from the system on singlesite installs.
@@ -1731 +1731 @@
 
         /* Site admins cannot be deleted */
-        if ( is_site_admin( bp_core_get_username( $user_id ) ) )
+        if ( is_super_admin( bp_core_get_username( $user_id ) ) )
                 return false;
 
@@ -2005 +2005 @@
                 return false;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 

branches/1.2/bp-core/bp-core-catchuri.php

@@ -246 +246 @@
         /* If this user has been marked as a spammer and the logged in user is not a site admin, redirect. */
         if ( isset( $bp->displayed_user->id ) && bp_core_is_user_spammer( $bp->displayed_user->id ) ) {
-                if ( !is_site_admin() )
+                if ( !is_super_admin() )
                         bp_core_redirect( $bp->root_domain );
                 else

branches/1.2/bp-core/bp-core-filters.php

@@ -44 +44 @@
         global $bp, $current_blog;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return $themes;
 

branches/1.2/bp-core/bp-core-settings.php

@@ -22 +22 @@
         bp_core_new_subnav_item( array( 'name' => __( 'Notifications', 'buddypress' ), 'slug' => 'notifications', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_notification_settings', 'position' => 20, 'user_has_access' => bp_is_my_profile() ) );
 
-        if ( !is_site_admin() && !(int) $bp->site_options['bp-disable-account-deletion'] )
+        if ( !is_super_admin() && !(int) $bp->site_options['bp-disable-account-deletion'] )
                 bp_core_new_subnav_item( array( 'name' => __( 'Delete Account', 'buddypress' ), 'slug' => 'delete-account', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_delete_account', 'position' => 90, 'user_has_access' => bp_is_my_profile() ) );
 }

branches/1.2/bp-core/bp-core-templatetags.php

@@ -1358 +1358 @@
         global $bp;
 
-        if ( is_site_admin() || is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
+        if ( is_super_admin() || is_user_logged_in() && $bp->loggedin_user->id == $bp->displayed_user->id )
                 $has_access = true;
         else

branches/1.2/bp-core/bp-core-wpabstraction.php

@@ -91 +91 @@
 }
 
-if ( !function_exists( 'is_site_admin' ) ) {
-        function is_site_admin( $user_id = false ) {
+if ( !function_exists( 'is_super_admin' ) ) {
+        function is_super_admin( $user_id = false ) {
                 if ( current_user_can( 'manage_options' ) )
                         return true;

branches/1.2/bp-forums.php

@@ -69 +69 @@
                         if ( $bp->groups->current_group = groups_get_group( array( 'group_id' => $_POST['topic_group_id'] ) ) ) {
                                 /* Auto join this user if they are not yet a member of this group */
-                                if ( !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                                if ( !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                                         groups_join_group( $bp->groups->current_group->id, $bp->groups->current_group->id );
 
@@ -95 +95 @@
         global $bp;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 

branches/1.2/bp-forums/bp-forums-templatetags.php

@@ -557 +557 @@
                 $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'edit', 'bp_forums_edit_topic' ) . '">' . __( 'Edit Topic', 'buddypress' ) . '</a>';
 
-                if ( $bp->is_item_admin || $bp->is_item_mod || is_site_admin() ) {
+                if ( $bp->is_item_admin || $bp->is_item_mod || is_super_admin() ) {
                         if ( 0 == (int)$forum_template->topic->topic_sticky )
                                 $links[] = '<a href="' . wp_nonce_url( bp_get_the_topic_permalink() . 'stick', 'bp_forums_stick_topic' ) . '">' . __( 'Sticky Topic', 'buddypress' ) . '</a>';

branches/1.2/bp-friends.php

@@ -55 +55 @@
         global $bp;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 

branches/1.2/bp-groups.php

@@ -129 +129 @@
 
                 /* Using "item" not "group" for generic support in other components. */
-                if ( is_site_admin() )
+                if ( is_super_admin() )
                         $bp->is_item_admin = 1;
                 else
@@ -184 +184 @@
                         // If this is a private or hidden group, does the user have access?
                         if ( 'private' == $bp->groups->current_group->status || 'hidden' == $bp->groups->current_group->status ) {
-                                if ( $bp->groups->current_group->is_user_member && is_user_logged_in() || is_site_admin() )
+                                if ( $bp->groups->current_group->is_user_member && is_user_logged_in() || is_super_admin() )
                                         $bp->groups->current_group->user_has_access = true;
                                 else
@@ -206 +206 @@
 
                         // If this is a private group, and the user is not a member, show a "Request Membership" nav item.
-                        if ( !is_site_admin() && is_user_logged_in() && !$bp->groups->current_group->is_user_member && !groups_check_for_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) && $bp->groups->current_group->status == 'private' )
+                        if ( !is_super_admin() && is_user_logged_in() && !$bp->groups->current_group->is_user_member && !groups_check_for_membership_request( $bp->loggedin_user->id, $bp->groups->current_group->id ) && $bp->groups->current_group->status == 'private' )
                                 bp_core_new_subnav_item( array( 'name' => __( 'Request Membership', 'buddypress' ), 'slug' => 'request-membership', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_request_membership', 'position' => 30 ) );
 
@@ -244 +244 @@
 
         /* Don't show this menu to non site admins or if you're viewing your own profile */
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
         ?>
@@ -370 +370 @@
 
                                 /* Auto join this user if they are not yet a member of this group */
-                                if ( $bp->groups->auto_join && !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                                if ( $bp->groups->auto_join && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                                         groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
 
@@ -548 +548 @@
 
                                 /* Auto join this user if they are not yet a member of this group */
-                                if ( $bp->groups->auto_join && !is_site_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
+                                if ( $bp->groups->auto_join && !is_super_admin() && 'public' == $bp->groups->current_group->status && !groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) )
                                         groups_join_group( $bp->groups->current_group->id, $bp->loggedin_user->id );
 
@@ -935 +935 @@
         if ( $bp->current_component == $bp->groups->slug && 'delete-group' == $bp->action_variables[0] ) {
 
-                if ( !$bp->is_item_admin && !is_site_admin() )
+                if ( !$bp->is_item_admin && !is_super_admin() )
                         return false;
 
@@ -1915 +1915 @@
 
         /* Be sure the user is a member of the group before posting. */
-        if ( !is_site_admin() && !groups_is_user_member( $user_id, $group_id ) )
+        if ( !is_super_admin() && !groups_is_user_member( $user_id, $group_id ) )
                 return false;
 

branches/1.2/bp-groups/bp-groups-classes.php

@@ -205 +205 @@
                 }
 
-                if ( !is_site_admin() )
+                if ( !is_super_admin() )
                         $hidden_sql = "AND status != 'hidden'";
 
@@ -264 +264 @@
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+                if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
                         $hidden_sql = "AND g.status != 'hidden'";
 
@@ -296 +296 @@
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+                if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
                         $hidden_sql = "AND g.status != 'hidden'";
 
@@ -329 +329 @@
                 }
 
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+                if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
                         $hidden_sql = "AND g.status != 'hidden'";
 
@@ -361 +361 @@
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+                if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
                         $hidden_sql = " AND g.status != 'hidden'";
 
@@ -397 +397 @@
                 }
 
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+                if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
                         $hidden_sql = " AND g.status != 'hidden'";
 
@@ -433 +433 @@
                 }
 
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+                if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
                         $hidden_sql = " AND g.status != 'hidden'";
 
@@ -470 +470 @@
                         $where_conditions[] = $wpdb->prepare( "g.status = 'public'" );
 
-                if ( !is_site_admin() )
+                if ( !is_super_admin() )
                         $where_conditions[] = $wpdb->prepare( "g.status != 'hidden'");
 
@@ -517 +517 @@
                 }
 
-                if ( !is_site_admin() )
+                if ( !is_super_admin() )
                         $hidden_sql = $wpdb->prepare( " AND status != 'hidden'");
 
@@ -544 +544 @@
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
 
-                if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
+                if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
                         $hidden_sql = "AND g.status != 'hidden'";
 
@@ -605 +605 @@
                 global $wpdb, $bp;
 
-                if ( !is_site_admin() )
+                if ( !is_super_admin() )
                         $hidden_sql = "WHERE status != 'hidden'";
 
@@ -881 +881 @@
                         $user_id = $bp->displayed_user->id;
 
-                if ( $user_id != $bp->loggedin_user->id && !is_site_admin() ) {
+                if ( $user_id != $bp->loggedin_user->id && !is_super_admin() ) {
                         return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT m.group_id) FROM {$bp->groups->table_name_members} m, {$bp->groups->table_name} g WHERE m.group_id = g.id AND g.status != 'hidden' AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $user_id ) );
                 } else {

branches/1.2/bp-groups/bp-groups-filters.php

@@ -93 +93 @@
         global $bp;
 
-        if ( is_site_admin() )
+        if ( is_super_admin() )
                 return true;
 

branches/1.2/bp-groups/bp-groups-templatetags.php

@@ -193 +193 @@
         global $bp, $groups_template;
 
-        if ( $bp->loggedin_user->is_site_admin )
+        if ( $bp->loggedin_user->is_super_admin )
                 return true;
 
@@ -968 +968 @@
  * Checks if current user is member of a group.
  *
- * @uses is_site_admin Check if current user is super admin
+ * @uses is_super_admin Check if current user is super admin
  * @uses apply_filters Creates bp_group_is_member filter and passes $is_member
  * @usedby groups/activity.php, groups/single/forum/edit.php, groups/single/forum/topic.php to determine template part visibility
@@ -980 +980 @@
 
         // Site admins always have access
-        if ( is_site_admin() )
+        if ( is_super_admin() )
                 return true;
 

branches/1.2/bp-messages.php

@@ -90 +90 @@
         global $bp;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 
@@ -117 +117 @@
         bp_core_new_subnav_item( array( 'name' => __( 'Compose', 'buddypress' ), 'slug' => 'compose', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_compose', 'position' => 30, 'user_has_access' => bp_is_my_profile() ) );
 
-        if ( is_site_admin() )
-                bp_core_new_subnav_item( array( 'name' => __( 'Notices', 'buddypress' ), 'slug' => 'notices', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_notices', 'position' => 90, 'user_has_access' => is_site_admin() ) );
+        if ( is_super_admin() )
+                bp_core_new_subnav_item( array( 'name' => __( 'Notices', 'buddypress' ), 'slug' => 'notices', 'parent_url' => $messages_link, 'parent_slug' => $bp->messages->slug, 'screen_function' => 'messages_screen_notices', 'position' => 90, 'user_has_access' => is_super_admin() ) );
 
         if ( $bp->current_component == $bp->messages->slug ) {
@@ -201 +201 @@
         global $bp, $notice_id;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 
@@ -286 +286 @@
         $thread_id = $bp->action_variables[0];
 
-        if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access($thread_id) && !is_site_admin() ) )
+        if ( !$thread_id || !messages_is_valid_thread( $thread_id ) || ( !messages_check_thread_access($thread_id) && !is_super_admin() ) )
                 bp_core_redirect( $bp->displayed_user->domain . $bp->current_component );
 
@@ -488 +488 @@
 
 function messages_send_notice( $subject, $message ) {
-        if ( !is_site_admin() || empty( $subject ) || empty( $message ) ) {
+        if ( !is_super_admin() || empty( $subject ) || empty( $message ) ) {
                 return false;
         } else {

branches/1.2/bp-messages/bp-messages-templatetags.php

@@ -158 +158 @@
         extract( $r, EXTR_SKIP );
 
-        if ( 'notices' == $bp->current_action && !is_site_admin() ) {
+        if ( 'notices' == $bp->current_action && !is_super_admin() ) {
                 wp_redirect( $bp->displayed_user->id );
         } else {

branches/1.2/bp-themes/bp-default/_inc/ajax.php

@@ -217 +217 @@
 
         /* Check access */
-        if ( !is_site_admin() && $activity->user_id != $bp->loggedin_user->id )
+        if ( !is_super_admin() && $activity->user_id != $bp->loggedin_user->id )
                 return false;
 
@@ -250 +250 @@
 
         /* Check access */
-        if ( !is_site_admin() && $comment->user_id != $bp->loggedin_user->id )
+        if ( !is_super_admin() && $comment->user_id != $bp->loggedin_user->id )
                 return false;
 

branches/1.2/bp-themes/bp-default/functions.php

@@ -90 +90 @@
 /* Hijack the saving of page on front setting to save the activity stream setting */
 function bp_dtheme_page_on_front_update( $oldvalue, $newvalue ) {
-        if ( !is_admin() || !is_site_admin() )
+        if ( !is_admin() || !is_super_admin() )
                 return false;
 

branches/1.2/bp-themes/bp-default/groups/create.php

@@ -53 +53 @@
                                                         </div>
                                                 <?php else : ?>
-                                                        <?php if ( is_site_admin() ) : ?>
+                                                        <?php if ( is_super_admin() ) : ?>
                                                                 <div class="checkbox">
                                                                         <label><input type="checkbox" disabled="disabled" name="disabled" id="disabled" value="0" /> <?php printf( __('<strong>Attention Site Admin:</strong> Group forums require the <a href="%s">correct setup and configuration</a> of a bbPress installation.', 'buddypress' ), bp_get_root_domain() . '/wp-admin/admin.php?page=bb-forums-setup' ) ?></label>

branches/1.2/bp-themes/bp-default/members/single/messages/compose.php

@@ -11 +11 @@
         </ul>
 
-        <?php if ( is_site_admin() ) : ?>
+        <?php if ( is_super_admin() ) : ?>
                 <input type="checkbox" id="send-notice" name="send-notice" value="1" /> <?php _e( "This is a notice to all users.", "buddypress" ) ?>
         <?php endif; ?>

branches/1.2/bp-xprofile.php

@@ -132 +132 @@
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
  * @global $wpdb WordPress DB access object.
- * @uses is_site_admin() returns true if the current user is a site admin, false if not
+ * @uses is_super_admin() returns true if the current user is a site admin, false if not
  * @uses bp_xprofile_install() runs the installation of DB tables for the xprofile component
  * @uses wp_enqueue_script() Adds a JS file to the JS queue ready for output
@@ -142 +142 @@
         global $wpdb, $bp;
 
-        if ( !is_site_admin() )
+        if ( !is_super_admin() )
                 return false;
 
@@ -207 +207 @@
 
         /* Don't show this menu to non site admins or if you're viewing your own profile */
-        if ( !is_site_admin() || bp_is_my_profile() )
+        if ( !is_super_admin() || bp_is_my_profile() )
                 return false;
         ?>
@@ -268 +268 @@
         global $bp;
 
-        if ( !bp_is_my_profile() && !is_site_admin() )
+        if ( !bp_is_my_profile() && !is_super_admin() )
                 return false;
 
@@ -358 +358 @@
         global $bp;
 
-        if ( !bp_is_my_profile() && !is_site_admin() )
+        if ( !bp_is_my_profile() && !is_super_admin() )
                 return false;
 
@@ -427 +427 @@
         check_admin_referer( 'bp_delete_avatar_link' );
 
-        if ( !bp_is_my_profile() && !is_site_admin() )
+        if ( !bp_is_my_profile() && !is_super_admin() )
                 return false;