summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--wp-admin/includes/mu.php30
-rw-r--r--wp-includes/wpmu-functions.php29
2 files changed, 30 insertions, 29 deletions
diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php
index 36720d0..250d24b 100644
--- a/wp-admin/includes/mu.php
+++ b/wp-admin/includes/mu.php
@@ -274,4 +274,34 @@ function xmlrpc_active_setting( $id ) {
<?php
}
add_action('wpmueditblogaction', 'xmlrpc_active_setting');
+
+function update_user_status( $id, $pref, $value, $refresh = 1 ) {
+ global $wpdb;
+
+ $wpdb->query( "UPDATE {$wpdb->users} SET {$pref} = '{$value}' WHERE ID = '$id'" );
+
+ if( $refresh == 1 )
+ refresh_user_details($id);
+
+ if( $pref == 'spam' ) {
+ if( $value == 1 )
+ do_action( "make_spam_user", $id );
+ else
+ do_action( "make_ham_user", $id );
+ }
+
+ return $value;
+}
+
+function refresh_user_details($id) {
+ $id = (int) $id;
+
+ if ( !$user = get_userdata( $id ) )
+ return false;
+
+ wp_cache_delete($id, 'users');
+ wp_cache_delete($user->user_login, 'userlogins');
+ return $id;
+}
+
?>
diff --git a/wp-includes/wpmu-functions.php b/wp-includes/wpmu-functions.php
index cd2ba8d..bfbe5ed 100644
--- a/wp-includes/wpmu-functions.php
+++ b/wp-includes/wpmu-functions.php
@@ -544,35 +544,6 @@ function update_archived( $id, $archived ) {
return $archived;
}
-function update_user_status( $id, $pref, $value, $refresh = 1 ) {
- global $wpdb;
-
- $wpdb->query( "UPDATE {$wpdb->users} SET {$pref} = '{$value}' WHERE ID = '$id'" );
-
- if( $refresh == 1 )
- refresh_user_details($id);
-
- if( $pref == 'spam' ) {
- if( $value == 1 )
- do_action( "make_spam_user", $id );
- else
- do_action( "make_ham_user", $id );
- }
-
- return $value;
-}
-
-function refresh_user_details($id) {
- $id = (int) $id;
-
- if ( !$user = get_userdata( $id ) )
- return false;
-
- wp_cache_delete($id, 'users');
- wp_cache_delete($user->user_login, 'userlogins');
- return $id;
-}
-
function update_blog_status( $id, $pref, $value, $refresh = 1 ) {
global $wpdb;