Changeset 15746 for trunk/wp-admin/includes/ms.php

Timestamp:

10/07/2010 07:34:18 PM (15 years ago)

Author:

ryan

Message:

First pass of user admin. Network admin and screen cleanups. see #14696

File:

• trunk/wp-admin/includes/ms.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -503 +503 @@
 
     $blog = get_active_blog_for_user( get_current_user_id() );
-    $dashboard_blog = get_dashboard_blog();
+
     if ( is_object( $blog ) ) {
         wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) ); // redirect and count to 5, "just in case"
         exit;
-    }
-
-    /*
-       If the user is a member of only 1 blog and the user's primary_blog isn't set to that blog,
-       then update the primary_blog record to match the user's blog
-     */
-    $blogs = get_blogs_of_user( get_current_user_id() );
-
-    if ( !empty( $blogs ) ) {
-        foreach( $blogs as $blogid => $blog ) {
-            if ( $blogid != $dashboard_blog->blog_id && get_user_meta( get_current_user_id() , 'primary_blog', true ) == $dashboard_blog->blog_id ) {
-                update_user_meta( get_current_user_id(), 'primary_blog', $blogid );
-                continue;
-            }
-        }
-        $blog = get_blog_details( get_user_meta( get_current_user_id(), 'primary_blog', true ) );
-            wp_redirect( get_admin_url( $blog->blog_id, '?c=' . $c ) );
-        exit;
-    }
+    } else {
+        wp_redirect( user_admin_url( '?c=' . $c ) ); // redirect and count to 5, "just in case"
+    }
+
     wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
 }