WordPress 4.7.2

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

diff --git a/wp-admin/my-sites.php b/wp-admin/my-sites.php
index fafa232932185ab0a877fe4208b26762e93078e4..2478b39b129645c6fdffe6a6c4e49a4e4bd2cd5a 100644 (file)
--- a/wp-admin/my-sites.php
+++ b/wp-admin/my-sites.php
@@ -13,7 +13,7 @@ if ( !is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
 
 if ( ! current_user_can('read') )
-       wp_die( __( 'You do not have sufficient permissions to access this page.' ) );
+       wp_die( __( 'Sorry, you are not allowed to access this page.' ) );
 
 $action = isset( $_POST['action'] ) ? $_POST['action'] : 'splash';
 
@@ -23,7 +23,7 @@ $updated = false;
 if ( 'updateblogsettings' == $action && isset( $_POST['primary_blog'] ) ) {
        check_admin_referer( 'update-my-sites' );
 
-       $blog = get_blog_details( (int) $_POST['primary_blog'] );
+       $blog = get_site( (int) $_POST['primary_blog'] );
        if ( $blog && isset( $blog->domain ) ) {
                update_user_option( $current_user->ID, 'primary_blog', (int) $_POST['primary_blog'], true );
                $updated = true;
@@ -39,14 +39,13 @@ 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. They 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>'
+               '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. They can use the links under each site to visit either the front end or the dashboard for that site.') . '</p>'
 ) );
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
-       '<p>' . __('<a href="https://codex.wordpress.org/Dashboard_My_Sites_Screen" target="_blank">Documentation on My Sites</a>') . '</p>' .
-       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Dashboard_My_Sites_Screen">Documentation on My Sites</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
 );
 
 require_once( ABSPATH . 'wp-admin/admin-header.php' );
@@ -56,7 +55,16 @@ if ( $updated ) { ?>
 <?php } ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php
+echo esc_html( $title );
+
+if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) {
+       /** This filter is documented in wp-login.php */
+       $sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
+       printf( ' <a href="%s" class="page-title-action">%s</a>', esc_url( $sign_up_url ), esc_html_x( 'Add New', 'site' ) );
+}
+?></h1>
+
 <?php
 if ( empty( $blogs ) ) :
        echo '<p>';
@@ -100,7 +108,7 @@ else :
                echo "<li>";
                echo "<h3>{$user_blog->blogname}</h3>";
                /**
-                * Filter the row links displayed for each site on the My Sites screen.
+                * Filters the row links displayed for each site on the My Sites screen.
                 *
                 * @since MU
                 *