Wordpress 3.3-scripts

[autoinstalls/wordpress.git] / wp-admin / my-sites.php

diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php
index 4e13096f06e26b96a339b1e5a562dc35d266d5ce..873b03cf954346fea8d7b1c504f548036ca0d849 100644 (file)
--- a/wp-admin/my-sites.php
+++ b/wp-admin/my-sites.php
@@ -17,10 +17,7 @@ if ( ! current_user_can('read') )
 
 $action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
 
-$blogs = get_blogs_of_user( $current_user->id );
-
-if ( empty( $blogs ) )
-       wp_die( __( 'You must be a member of at least one site to use this page.' ) );
+$blogs = get_blogs_of_user( $current_user->ID );
 
 $updated = false;
 if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
@@ -28,7 +25,7 @@ if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
 
        $blog = get_blog_details( (int) $_POST['primary_blog'] );
        if ( $blog && isset( $blog->domain ) ) {
-               update_user_option( $current_user->id, 'primary_blog', (int) $_POST['primary_blog'], true );
+               update_user_option( $current_user->ID, 'primary_blog', (int) $_POST['primary_blog'], true );
                $updated = true;
        } else {
                wp_die( __( 'The primary site you chose does not exist.' ) );
@@ -38,11 +35,17 @@ if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
 $title = __( 'My Sites' );
 $parent_file = 'index.php';
 
-add_contextual_help($current_screen,
-       '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
-       '<p>' . __('Up until WordPress version 3.0, what is now called a Multi-site Network had to be installed separately as WordPress MU (multi-user).') . '</p>' .
+get_current_screen()->add_help_tab( array(
+       'id'      => 'overview',
+       'title'   => __('Overview'),
+       'content' =>
+               '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
+               '<p>' . __('Up until WordPress version 3.0, what is now called a Multisite Network had to be installed separately as WordPress MU (multi-user).') . '</p>'
+) );
+
+get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
-       '<p>' . __('<a href="http://codex.wordpress.org/Dashboard_My_Sites_SubPanel" target="_blank">Documentation on My Sites</a>') . '</p>' .
+       '<p>' . __('<a href="http://codex.wordpress.org/Dashboard_My_Sites_Screen" target="_blank">Documentation on My Sites</a>') . '</p>' .
        '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
@@ -55,6 +58,13 @@ if ( $updated ) { ?>
 <div class="wrap">
 <?php screen_icon(); ?>
 <h2><?php echo esc_html( $title ); ?></h2>
+<?php
+if ( empty( $blogs ) ) :
+       echo '<p>';
+       _e( 'You must be a member of at least one site to use this page.' );
+       echo '</p>';
+else :
+?>
 <form id="myblogs" action="" method="post">
        <?php
        choose_primary_blog();
@@ -104,6 +114,7 @@ if ( $updated ) { ?>
        <?php wp_nonce_field( 'update-my-sites' ); ?>
        <?php submit_button(); ?>
        </form>
+<?php endif; ?>
        </div>
 <?php
 include( './admin-footer.php' );