' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '
' . + '' . __('Info — The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '
' . + '' . __('Users — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '
' . + '' . sprintf( __('Themes — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '
' . + '' . __('Settings — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '
' + ); +} + +/** + * Returns the content for the help sidebar on the Edit Site screens. + * + * @since 4.9.0 + * + * @return string Help sidebar content. + */ +function get_site_screen_help_sidebar_content() { + return '' . __('For more information:') . '
' . + '' . __('Documentation on Site Management') . '
' . + '' . __('Support Forums') . '
'; +} diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php index 17df6aeda7..4c0630837f 100644 --- a/wp-admin/network/site-info.php +++ b/wp-admin/network/site-info.php @@ -14,22 +14,8 @@ if ( ! current_user_can( 'manage_sites' ) ) { wp_die( __( 'Sorry, you are not allowed to edit this site.' ) ); } -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __( 'Overview' ), - 'content' => - '' . __( 'The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.' ) . '
' . - '' . __( 'Info — The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.' ) . '
' . - '' . __( 'Users — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.' ) . '
' . - '' . sprintf( __( 'Themes — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '
' . - '' . __( 'Settings — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.' ) . '
' -) ); - -get_current_screen()->set_help_sidebar( - '' . __( 'For more information:' ) . '
' . - '' . __( 'Documentation on Site Management' ) . '
' . - '' . __( 'Support Forums' ) . '
' -); +get_current_screen()->add_help_tab( get_site_screen_help_tab_args() ); +get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() ); $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php index 9d13d307f2..b6e9bc47b5 100644 --- a/wp-admin/network/site-settings.php +++ b/wp-admin/network/site-settings.php @@ -13,22 +13,8 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! current_user_can( 'manage_sites' ) ) wp_die( __( 'Sorry, you are not allowed to edit this site.' ) ); -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __('Overview'), - 'content' => - '' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '
' . - '' . __('Info — The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '
' . - '' . __('Users — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '
' . - '' . sprintf( __('Themes — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '
' . - '' . __('Settings — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '
' -) ); - -get_current_screen()->set_help_sidebar( - '' . __('For more information:') . '
' . - '' . __('Documentation on Site Management') . '
' . - '' . __('Support Forums') . '
' -); +get_current_screen()->add_help_tab( get_site_screen_help_tab_args() ); +get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() ); $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index b7b422d487..34beed95e0 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -13,22 +13,8 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! current_user_can( 'manage_sites' ) ) wp_die( __( 'Sorry, you are not allowed to manage themes for this site.' ) ); -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __('Overview'), - 'content' => - '' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '
' . - '' . __('Info — The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '
' . - '' . __('Users — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '
' . - '' . sprintf( __('Themes — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '
' . - '' . __('Settings — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '
' -) ); - -get_current_screen()->set_help_sidebar( - '' . __('For more information:') . '
' . - '' . __('Documentation on Site Management') . '
' . - '' . __('Support Forums') . '
' -); +get_current_screen()->add_help_tab( get_site_screen_help_tab_args() ); +get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() ); get_current_screen()->set_screen_reader_content( array( 'heading_views' => __( 'Filter site themes list' ), diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index a6ecd9e207..5165996d44 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -16,22 +16,8 @@ if ( ! current_user_can('manage_sites') ) $wp_list_table = _get_list_table('WP_Users_List_Table'); $wp_list_table->prepare_items(); -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __('Overview'), - 'content' => - '' . __('The menu is for editing information specific to individual sites, particularly if the admin area of a site is unavailable.') . '
' . - '' . __('Info — The site URL is rarely edited as this can cause the site to not work properly. The Registered date and Last Updated date are displayed. Network admins can mark a site as archived, spam, deleted and mature, to remove from public listings or disable.') . '
' . - '' . __('Users — This displays the users associated with this site. You can also change their role, reset their password, or remove them from the site. Removing the user from the site does not remove the user from the network.') . '
' . - '' . sprintf( __('Themes — This area shows themes that are not already enabled across the network. Enabling a theme in this menu makes it accessible to this site. It does not activate the theme, but allows it to show in the site’s Appearance menu. To enable a theme for the entire network, see the Network Themes screen.' ), network_admin_url( 'themes.php' ) ) . '
' . - '' . __('Settings — This page shows a list of all settings associated with this site. Some are created by WordPress and others are created by plugins you activate. Note that some fields are grayed out and say Serialized Data. You cannot modify these values due to the way the setting is stored in the database.') . '
' -) ); - -get_current_screen()->set_help_sidebar( - '' . __('For more information:') . '
' . - '' . __('Documentation on Site Management') . '
' . - '' . __('Support Forums') . '
' -); +get_current_screen()->add_help_tab( get_site_screen_help_tab_args() ); +get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() ); get_current_screen()->set_screen_reader_content( array( 'heading_views' => __( 'Filter site users list' ), diff --git a/wp-includes/version.php b/wp-includes/version.php index 051e425e6e..fef47e223c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-alpha-41064'; +$wp_version = '4.9-alpha-41065'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.