Changeset 13311 for trunk/wp-includes/ms-functions.php

Timestamp:

02/22/2010 09:25:32 PM (15 years ago)

Author:

nacin

Message:

Don't use deprecated *_usermeta() functions. Props technosailor fixes #10837

File:

• trunk/wp-includes/ms-functions.php (modified) (11 diffs)

trunk/wp-includes/ms-functions.php

@@ -78 +78 @@
         $details = get_dashboard_blog();
         add_user_to_blog( $details->blog_id, $user_id, 'subscriber' );
-        update_usermeta( $user_id, 'primary_blog', $details->blog_id );
+        update_user_meta( $user_id, 'primary_blog', $details->blog_id );
         wp_cache_delete( $user_id, 'users' );
         return $details;
     }
 
-    $primary_blog = get_usermeta( $user_id, "primary_blog" );
+    $primary_blog = get_user_meta( $user_id, "primary_blog" );
     $details = get_dashboard_blog();
     if ( $primary_blog ) {
@@ -89 +89 @@
         if ( isset( $blogs[ $primary_blog ] ) == false ) {
             add_user_to_blog( $details->blog_id, $user_id, 'subscriber' );
-            update_usermeta( $user_id, 'primary_blog', $details->blog_id );
+            update_user_meta( $user_id, 'primary_blog', $details->blog_id );
             wp_cache_delete( $user_id, 'users' );
         } else {
@@ -96 +96 @@
     } else {
         add_user_to_blog( $details->blog_id, $user_id, 'subscriber' ); // Add subscriber permission for dashboard blog
-        update_usermeta( $user_id, 'primary_blog', $details->blog_id );
+        update_user_meta( $user_id, 'primary_blog', $details->blog_id );
     }
 
@@ -110 +110 @@
                     $ret = $blog;
                     $changed = false;
-                    if ( get_usermeta( $user_id , 'primary_blog' ) != $blog_id ) {
-                        update_usermeta( $user_id, 'primary_blog', $blog_id );
+                    if ( get_user_meta( $user_id , 'primary_blog' ) != $blog_id ) {
+                        update_user_meta( $user_id, 'primary_blog', $blog_id );
                         $changed = true;
                     }
-                    if ( !get_usermeta($user_id , 'source_domain') ) {
-                        update_usermeta( $user_id, 'source_domain', $blog->domain );
+                    if ( !get_user_meta($user_id , 'source_domain') ) {
+                        update_user_meta( $user_id, 'source_domain', $blog->domain );
                         $changed = true;
                     }
@@ -127 +127 @@
             $dashboard_blog = get_dashboard_blog();
             add_user_to_blog( $dashboard_blog->blog_id, $user_id, 'subscriber' ); // Add subscriber permission for dashboard blog
-            update_usermeta( $user_id, 'primary_blog', $dashboard_blog->blog_id );
+            update_user_meta( $user_id, 'primary_blog', $dashboard_blog->blog_id );
             return $dashboard_blog;
         }
@@ -249 +249 @@
         return new WP_Error('user_does_not_exist', __('That user does not exist.'));
 
-    if ( !get_usermeta($user_id, 'primary_blog') ) {
-        update_usermeta($user_id, 'primary_blog', $blog_id);
+    if ( !get_user_meta($user_id, 'primary_blog') ) {
+        update_user_meta($user_id, 'primary_blog', $blog_id);
         $details = get_blog_details($blog_id);
-        update_usermeta($user_id, 'source_domain', $details->domain);
+        update_user_meta($user_id, 'source_domain', $details->domain);
     }
 
@@ -271 +271 @@
     // If being removed from the primary blog, set a new primary if the user is assigned
     // to multiple blogs.
-    $primary_blog = get_usermeta($user_id, 'primary_blog');
+    $primary_blog = get_user_meta($user_id, 'primary_blog');
     if ( $primary_blog == $blog_id ) {
         $new_id = '';
@@ -284 +284 @@
         }
 
-        update_usermeta($user_id, 'primary_blog', $new_id);
-        update_usermeta($user_id, 'source_domain', $new_domain);
+        update_user_meta($user_id, 'primary_blog', $new_id);
+        update_user_meta($user_id, 'source_domain', $new_domain);
     }
 
@@ -294 +294 @@
     $blogs = get_blogs_of_user($user_id);
     if ( count($blogs) == 0 ) {
-        update_usermeta($user_id, 'primary_blog', '');
-        update_usermeta($user_id, 'source_domain', '');
+        update_user_meta($user_id, 'primary_blog', '');
+        update_user_meta($user_id, 'source_domain', '');
     }
 
@@ -827 +827 @@
     update_option( 'blog_public', $meta['public'] );
 
-    if ( !is_super_admin() && get_usermeta( $user_id, 'primary_blog' ) == get_site_option( 'dashboard_blog', 1 ) )
-        update_usermeta( $user_id, 'primary_blog', $blog_id );
+    if ( !is_super_admin() && get_user_meta( $user_id, 'primary_blog' ) == get_site_option( 'dashboard_blog', 1 ) )
+        update_user_meta( $user_id, 'primary_blog', $blog_id );
 
     restore_current_blog();
@@ -1307 +1307 @@
         remove_user_from_blog($user_id, $current_site->blogid); // remove user from main blog.
         add_user_to_blog( $blog_id, $user_id, $role );
-        update_usermeta( $user_id, 'primary_blog', $blog_id );
+        update_user_meta( $user_id, 'primary_blog', $blog_id );
     }
 }