Changeset 13329

Timestamp:

02/23/2010 10:42:40 AM (15 years ago)

Author:

nacin

Message:

Switch over to *_user_meta() syntax. The old get_usermeta() would return a string when only one value was found, get_user_meta() requires $single = true. Fixes #10837

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (5 diffs)

trunk/wp-admin/includes/ms.php

@@ -544 +544 @@
     if ( !empty( $blogs ) ) {
         foreach( $blogs as $blogid => $blog ) {
-            if ( $blogid != $dashboard_blog->blog_id && get_user_meta( $current_user->ID , 'primary_blog' ) == $dashboard_blog->blog_id ) {
+            if ( $blogid != $dashboard_blog->blog_id && get_user_meta( $current_user->ID , 'primary_blog', true ) == $dashboard_blog->blog_id ) {
                 update_user_meta( $current_user->ID, 'primary_blog', $blogid );
                 continue;
             }
         }
-        $blog = get_blog_details( get_user_meta( $current_user->ID , 'primary_blog' ) );
+        $blog = get_blog_details( get_user_meta( $current_user->ID, 'primary_blog', true ) );
         $protocol = ( is_ssl() ? 'https://' : 'http://' );
         wp_redirect( $protocol . $blog->domain . $blog->path . 'wp-admin/?c=' . $c ); // redirect and count to 5, "just in case"
@@ -691 +691 @@
         <?php
         $all_blogs = get_blogs_of_user( $current_user->ID );
-        $primary_blog = get_user_meta($current_user->ID, 'primary_blog');
+        $primary_blog = get_user_meta($current_user->ID, 'primary_blog', true);
         if ( count( $all_blogs ) > 1 ) {
             $found = false;

trunk/wp-admin/includes/upgrade.php

@@ -705 +705 @@
         $caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
         if ( empty($caps) || defined('RESET_CAPS') ) {
-            $level = get_user_meta($user->ID, $wpdb->prefix . 'user_level');
+            $level = get_user_meta($user->ID, $wpdb->prefix . 'user_level', true);
             $role = translate_level_to_role($level);
             update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );

trunk/wp-includes/ms-functions.php

@@ -83 +83 @@
     }
 
-    $primary_blog = get_user_meta( $user_id, "primary_blog" );
+    $primary_blog = get_user_meta( $user_id, 'primary_blog', true );
     $details = get_dashboard_blog();
     if ( $primary_blog ) {
@@ -110 +110 @@
                     $ret = $blog;
                     $changed = false;
-                    if ( get_user_meta( $user_id , 'primary_blog' ) != $blog_id ) {
+                    if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) {
                         update_user_meta( $user_id, 'primary_blog', $blog_id );
                         $changed = true;
                     }
-                    if ( !get_user_meta($user_id , 'source_domain') ) {
+                    if ( !get_user_meta($user_id , 'source_domain', true) ) {
                         update_user_meta( $user_id, 'source_domain', $blog->domain );
                         $changed = true;
@@ -249 +249 @@
         return new WP_Error('user_does_not_exist', __('That user does not exist.'));
 
-    if ( !get_user_meta($user_id, 'primary_blog') ) {
+    if ( !get_user_meta($user_id, 'primary_blog', true) ) {
         update_user_meta($user_id, 'primary_blog', $blog_id);
         $details = get_blog_details($blog_id);
@@ -271 +271 @@
     // If being removed from the primary blog, set a new primary if the user is assigned
     // to multiple blogs.
-    $primary_blog = get_user_meta($user_id, 'primary_blog');
+    $primary_blog = get_user_meta($user_id, 'primary_blog', true);
     if ( $primary_blog == $blog_id ) {
         $new_id = '';
@@ -827 +827 @@
     update_option( 'blog_public', $meta['public'] );
 
-    if ( !is_super_admin() && get_user_meta( $user_id, 'primary_blog' ) == get_site_option( 'dashboard_blog', 1 ) )
+    if ( !is_super_admin() && get_user_meta( $user_id, 'primary_blog', true ) == get_site_option( 'dashboard_blog', 1 ) )
         update_user_meta( $user_id, 'primary_blog', $blog_id );