WordPress 4.7.1-scripts

[autoinstalls/wordpress.git] / wp-admin / network / settings.php

diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index cd8e251d8bfbb2d070f1c31c115c85e17cf3b86a..5d81cdf36924a293fd5ee6762f6d7b2938e5b2a7 100644 (file)
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -13,11 +13,8 @@ require_once( dirname( __FILE__ ) . '/admin.php' );
 /** WordPress Translation Install API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-if ( ! is_multisite() )
-       wp_die( __( 'Multisite support is not enabled.' ) );
-
 if ( ! current_user_can( 'manage_network_options' ) )
-       wp_die( __( 'You do not have permission to access this page.' ), 403 );
+       wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
 
 $title = __( 'Network Settings' );
 $parent_file = 'settings.php';
@@ -40,8 +37,8 @@ get_current_screen()->add_help_tab( array(
 
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
-       '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen" target="_blank">Documentation on Network Settings</a>') . '</p>' .
-       '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Settings_Screen">Documentation on Network Settings</a>') . '</p>' .
+       '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
 );
 
 if ( $_POST ) {
@@ -62,6 +59,7 @@ if ( $_POST ) {
                'first_post', 'first_page', 'first_comment', 'first_comment_url', 'first_comment_author',
                'welcome_email', 'welcome_user_email', 'fileupload_maxk', 'global_terms_enabled',
                'illegal_names', 'limited_email_domains', 'banned_email_domains', 'WPLANG', 'admin_email',
+               'first_comment_email',
        );
 
        // Handle translation install.
@@ -93,7 +91,7 @@ if ( $_POST ) {
 include( ABSPATH . 'wp-admin/admin-header.php' );
 
 if ( isset( $_GET['updated'] ) ) {
-       ?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Options saved.' ) ?></p></div><?php
+       ?><div id="message" class="updated notice is-dismissible"><p><?php _e( 'Settings saved.' ) ?></p></div><?php
 }
 ?>
 
@@ -106,7 +104,7 @@ if ( isset( $_GET['updated'] ) ) {
                        <tr>
                                <th scope="row"><label for="site_name"><?php _e( 'Network Title' ) ?></label></th>
                                <td>
-                                       <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( $current_site->site_name ) ?>" />
+                                       <input name="site_name" type="text" id="site_name" class="regular-text" value="<?php echo esc_attr( get_network()->site_name ) ?>" />
                                </td>
                        </tr>
 
@@ -258,12 +256,21 @@ if ( isset( $_GET['updated'] ) ) {
                        <tr>
                                <th scope="row"><label for="first_comment_author"><?php _e( 'First Comment Author' ) ?></label></th>
                                <td>
-                                       <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo get_site_option('first_comment_author') ?>" />
+                                       <input type="text" size="40" name="first_comment_author" id="first_comment_author" aria-describedby="first-comment-author-desc" value="<?php echo esc_attr( get_site_option('first_comment_author') ); ?>" />
                                        <p class="description" id="first-comment-author-desc">
                                                <?php _e( 'The author of the first comment on a new site.' ) ?>
                                        </p>
                                </td>
                        </tr>
+                       <tr>
+                               <th scope="row"><label for="first_comment_email"><?php _e( 'First Comment Email' ) ?></label></th>
+                               <td>
+                                       <input type="text" size="40" name="first_comment_email" id="first_comment_email" aria-describedby="first-comment-email-desc" value="<?php echo esc_attr( get_site_option( 'first_comment_email' ) ); ?>" />
+                                       <p class="description" id="first-comment-email-desc">
+                                               <?php _e( 'The email address of the first comment author on a new site.' ) ?>
+                                       </p>
+                               </td>
+                       </tr>
                        <tr>
                                <th scope="row"><label for="first_comment_url"><?php _e( 'First Comment URL' ) ?></label></th>
                                <td>
@@ -299,7 +306,13 @@ if ( isset( $_GET['updated'] ) ) {
                        <tr>
                                <th scope="row"><label for="fileupload_maxk"><?php _e( 'Max upload file size' ) ?></label></th>
                                <td>
-                                       <?php printf( _x( '%s KB', 'File size in kilobytes' ), '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />' ); ?>
+                                       <?php
+                                               printf(
+                                                       /* translators: %s: File size in kilobytes */
+                                                       __( '%s KB' ),
+                                                       '<input name="fileupload_maxk" type="number" min="0" style="width: 100px" id="fileupload_maxk" aria-describedby="fileupload-maxk-desc" value="' . esc_attr( get_site_option( 'fileupload_maxk', 300 ) ) . '" />'
+                                               );
+                                       ?>
                                        <p class="screen-reader-text" id="fileupload-maxk-desc">
                                                <?php _e( 'Size in kilobytes' ) ?>
                                        </p>
@@ -347,7 +360,7 @@ if ( isset( $_GET['updated'] ) ) {
                        <?php
                        $menu_perms = get_site_option( 'menu_items' );
                        /**
-                        * Filter available network-wide administration menu options.
+                        * Filters available network-wide administration menu options.
                         *
                         * Options returned to this filter are output as individual checkboxes that, when selected,
                         * enable site administrator access to the specified administration menu in certain contexts.