diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/network/site-themes.php --- a/wp/wp-admin/network/site-themes.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/network/site-themes.php Mon Oct 14 18:28:13 2019 +0200 @@ -10,28 +10,31 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! current_user_can( 'manage_sites' ) ) +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( 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' ), - 'heading_pagination' => __( 'Site themes list navigation' ), - 'heading_list' => __( 'Site themes list' ), -) ); +get_current_screen()->set_screen_reader_content( + array( + 'heading_views' => __( 'Filter site themes list' ), + 'heading_pagination' => __( 'Site themes list navigation' ), + 'heading_list' => __( 'Site themes list' ), + ) +); -$wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); +$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' ); $action = $wp_list_table->current_action(); -$s = isset($_REQUEST['s']) ? $_REQUEST['s'] : ''; +$s = isset( $_REQUEST['s'] ) ? $_REQUEST['s'] : ''; // Clean up request URI from temporary args for screen options/paging uri's to work as expected. -$temp_args = array( 'enabled', 'disabled', 'error' ); +$temp_args = array( 'enabled', 'disabled', 'error' ); $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] ); -$referer = remove_query_arg( $temp_args, wp_get_referer() ); +$referer = remove_query_arg( $temp_args, wp_get_referer() ); if ( ! empty( $_REQUEST['paged'] ) ) { $referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer ); @@ -39,8 +42,9 @@ $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; -if ( ! $id ) - wp_die( __('Invalid site ID.') ); +if ( ! $id ) { + wp_die( __( 'Invalid site ID.' ) ); +} $wp_list_table->prepare_items(); @@ -49,8 +53,9 @@ wp_die( __( 'The requested site does not exist.' ) ); } -if ( !can_edit_network( $details->site_id ) ) +if ( ! can_edit_network( $details->site_id ) ) { wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 ); +} $is_main_site = is_main_site( $id ); @@ -61,35 +66,38 @@ switch ( $action ) { case 'enable': check_admin_referer( 'enable-theme_' . $_GET['theme'] ); - $theme = $_GET['theme']; + $theme = $_GET['theme']; $action = 'enabled'; - $n = 1; - if ( !$allowed_themes ) + $n = 1; + if ( ! $allowed_themes ) { $allowed_themes = array( $theme => true ); - else - $allowed_themes[$theme] = true; + } else { + $allowed_themes[ $theme ] = true; + } break; case 'disable': check_admin_referer( 'disable-theme_' . $_GET['theme'] ); - $theme = $_GET['theme']; + $theme = $_GET['theme']; $action = 'disabled'; - $n = 1; - if ( !$allowed_themes ) + $n = 1; + if ( ! $allowed_themes ) { $allowed_themes = array(); - else - unset( $allowed_themes[$theme] ); + } else { + unset( $allowed_themes[ $theme ] ); + } break; case 'enable-selected': check_admin_referer( 'bulk-themes' ); if ( isset( $_POST['checked'] ) ) { $themes = (array) $_POST['checked']; $action = 'enabled'; - $n = count( $themes ); - foreach ( (array) $themes as $theme ) + $n = count( $themes ); + foreach ( (array) $themes as $theme ) { $allowed_themes[ $theme ] = true; + } } else { $action = 'error'; - $n = 'none'; + $n = 'none'; } break; case 'disable-selected': @@ -97,19 +105,20 @@ if ( isset( $_POST['checked'] ) ) { $themes = (array) $_POST['checked']; $action = 'disabled'; - $n = count( $themes ); - foreach ( (array) $themes as $theme ) + $n = count( $themes ); + foreach ( (array) $themes as $theme ) { unset( $allowed_themes[ $theme ] ); + } } else { $action = 'error'; - $n = 'none'; + $n = 'none'; } break; default: if ( isset( $_POST['checked'] ) ) { check_admin_referer( 'bulk-themes' ); $themes = (array) $_POST['checked']; - $n = count( $themes ); + $n = count( $themes ); $screen = get_current_screen()->id; /** @@ -130,14 +139,22 @@ $referer = apply_filters( "handle_network_bulk_actions-{$screen}", $referer, $action, $themes, $id ); } else { $action = 'error'; - $n = 'none'; + $n = 'none'; } } update_option( 'allowedthemes', $allowed_themes ); restore_current_blog(); - wp_safe_redirect( add_query_arg( array( 'id' => $id, $action => $n ), $referer ) ); + wp_safe_redirect( + add_query_arg( + array( + 'id' => $id, + $action => $n, + ), + $referer + ) + ); exit; } @@ -152,7 +169,7 @@ /* translators: %s: site name */ $title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) ); -$parent_file = 'sites.php'; +$parent_file = 'sites.php'; $submenu_file = 'sites.php'; require( ABSPATH . 'wp-admin/admin-header.php' ); ?> @@ -162,10 +179,12 @@
$id, - 'selected' => 'site-themes' -) ); +network_edit_site_nav( + array( + 'blog_id' => $id, + 'selected' => 'site-themes', + ) +); if ( isset( $_GET['enabled'] ) ) { $enabled = absint( $_GET['enabled'] ); @@ -185,23 +204,24 @@ echo '' . sprintf( $message, number_format_i18n( $disabled ) ) . '
' . __( 'No theme selected.' ) . '