Changeset 2925 for trunk/bp-core.php

Timestamp:

04/15/2010 11:59:40 AM (14 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk.

File:

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

trunk/bp-core.php

@@ -460 +460 @@
         }
 
-        do_action( 'bp_core_action_set_spammer_status', $errors );
+        do_action( 'bp_core_action_delete_user', $errors );
 
         if ( $errors )
@@ -494 +494 @@
         'search_terms' => false, // Limit to users that match these search terms
 
+        'include' => false, // Pass comma separated list of user_ids to limit to only these users
         'per_page' => 20, // The number of results to return per page
         'page' => 1, // The page to return if limiting per page
@@ -502 +503 @@
     extract( $params, EXTR_SKIP );
 
-    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $search_terms, $populate_extras ), &$params );
+    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras ), &$params );
 }
 
@@ -914 +915 @@
     global $wpdb;
 
-    if ( !empty( $username ) )
-        return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
+    if ( empty( $username ) )
+        return false;
+
+    return apply_filters( 'bp_core_get_userid', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_login = %s", $username ) ) );
 }
 
@@ -937 +940 @@
     return apply_filters( 'bp_core_get_userid_from_nicename', $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . CUSTOM_USER_TABLE . " WHERE user_nicename = %s", $user_nicename ) ) );
 }
-
 
 /**
@@ -1430 +1432 @@
         return $number;
 
-    return apply_filters( 'bp_core_bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
+    return apply_filters( 'bp_core_number_format', number_format( $number, $decimals ), $number, $decimals );
 }
 
@@ -1477 +1479 @@
             unset( $site_path[2] );
 
-            $site_path = '/' . implode( '/', $site_path ) . '/';
+            if ( !count( $site_path ) )
+                $site_path = '/';
+            else
+                $site_path = '/' . implode( '/', $site_path ) . '/';
         }
     }
@@ -1483 +1488 @@
     return apply_filters( 'bp_core_get_site_path', $site_path );
 }
-
 /**
  * bp_core_get_site_options()
@@ -1606 +1610 @@
  * @package BuddyPress Core
  * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses check_admin_referer() Checks for a valid security nonce.
  * @uses is_site_admin() Checks to see if the user is a site administrator.
- * @uses wpmu_delete_user() Deletes a user from the system.
+ * @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.
+ * @uses get_site_option Checks if account deletion is allowed
  */
 function bp_core_delete_account( $user_id = false ) {
@@ -1620 +1625 @@
         return false;
 
-    /* Site admins should not be allowed to be deleted */
-    if ( bp_core_is_multisite() && is_site_admin( bp_core_get_username( $user_id ) ) )
-        return false;
-
-    if ( bp_core_is_multisite() && function_exists('wpmu_delete_user') ) {
+    /* Specifically handle multi-site environment */
+    if ( bp_core_is_multisite() ) {
+        /* Site admins cannot be deleted */
+        if ( is_site_admin( bp_core_get_username( $user_id ) ) )
+            return false;
+
         require_once( ABSPATH . '/wp-admin/includes/mu.php' );
         require_once( ABSPATH . '/wp-admin/includes/user.php' );
@@ -1631 +1637 @@
     }
 
+    /* Single site user deletion */
     require_once( ABSPATH . '/wp-admin/includes/user.php' );
     return wp_delete_user( $user_id );
@@ -1741 +1748 @@
     ?>
 
-<!-- Generated in <?php timer_stop(1); ?> seconds. (<?php echo get_num_queries(); ?> q) -->
+<!-- Generated in <?php timer_stop(1); ?> seconds. -->
 
     <?php
@@ -1812 +1819 @@
     $user = get_userdatabylogin( $username );
 
-    if ( (int)$user->spam )
+    if ( ( bp_core_is_multisite() && (int)$user->spam ) || 1 == (int)$user->user_status )
         bp_core_redirect( $bp->root_domain );
     else