diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/network/themes.php --- a/wp/wp-admin/network/themes.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/network/themes.php Mon Oct 14 18:28:13 2019 +0200 @@ -10,40 +10,42 @@ /** Load WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( !current_user_can('manage_network_themes') ) +if ( ! current_user_can( 'manage_network_themes' ) ) { wp_die( __( 'Sorry, you are not allowed to manage network themes.' ) ); +} -$wp_list_table = _get_list_table('WP_MS_Themes_List_Table'); -$pagenum = $wp_list_table->get_pagenum(); +$wp_list_table = _get_list_table( 'WP_MS_Themes_List_Table' ); +$pagenum = $wp_list_table->get_pagenum(); $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', 'deleted', 'error' ); +$temp_args = array( 'enabled', 'disabled', 'deleted', '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 ( $action ) { switch ( $action ) { case 'enable': - check_admin_referer('enable-theme_' . $_GET['theme']); + check_admin_referer( 'enable-theme_' . $_GET['theme'] ); WP_Theme::network_enable_theme( $_GET['theme'] ); - if ( false === strpos( $referer, '/network/themes.php' ) ) + if ( false === strpos( $referer, '/network/themes.php' ) ) { wp_redirect( network_admin_url( 'themes.php?enabled=1' ) ); - else + } else { wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) ); + } exit; case 'disable': - check_admin_referer('disable-theme_' . $_GET['theme']); + check_admin_referer( 'disable-theme_' . $_GET['theme'] ); WP_Theme::network_disable_theme( $_GET['theme'] ); wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) ); exit; case 'enable-selected': - check_admin_referer('bulk-themes'); + check_admin_referer( 'bulk-themes' ); $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array(); - if ( empty($themes) ) { + if ( empty( $themes ) ) { wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) ); exit; } @@ -51,43 +53,44 @@ wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) ); exit; case 'disable-selected': - check_admin_referer('bulk-themes'); + check_admin_referer( 'bulk-themes' ); $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array(); - if ( empty($themes) ) { + if ( empty( $themes ) ) { wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) ); exit; } WP_Theme::network_disable_theme( (array) $themes ); wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) ); exit; - case 'update-selected' : + case 'update-selected': check_admin_referer( 'bulk-themes' ); - if ( isset( $_GET['themes'] ) ) + if ( isset( $_GET['themes'] ) ) { $themes = explode( ',', $_GET['themes'] ); - elseif ( isset( $_POST['checked'] ) ) + } elseif ( isset( $_POST['checked'] ) ) { $themes = (array) $_POST['checked']; - else + } else { $themes = array(); + } - $title = __( 'Update Themes' ); + $title = __( 'Update Themes' ); $parent_file = 'themes.php'; - require_once(ABSPATH . 'wp-admin/admin-header.php'); + require_once( ABSPATH . 'wp-admin/admin-header.php' ); echo '
'; echo '

' . esc_html( $title ) . '

'; - $url = self_admin_url('update.php?action=update-selected-themes&themes=' . urlencode( join(',', $themes) )); - $url = wp_nonce_url($url, 'bulk-update-themes'); + $url = self_admin_url( 'update.php?action=update-selected-themes&themes=' . urlencode( join( ',', $themes ) ) ); + $url = wp_nonce_url( $url, 'bulk-update-themes' ); echo ""; echo '
'; - require_once(ABSPATH . 'wp-admin/admin-footer.php'); + require_once( ABSPATH . 'wp-admin/admin-footer.php' ); exit; case 'delete-selected': if ( ! current_user_can( 'delete_themes' ) ) { - wp_die( __('Sorry, you are not allowed to delete themes for this site.') ); + wp_die( __( 'Sorry, you are not allowed to delete themes for this site.' ) ); } check_admin_referer( 'bulk-themes' ); @@ -111,7 +114,7 @@ $theme_info[ $theme ] = wp_get_theme( $theme ); } - include(ABSPATH . 'wp-admin/update.php'); + include( ABSPATH . 'wp-admin/update.php' ); $parent_file = 'themes.php'; @@ -132,14 +135,14 @@ @@ -147,21 +150,21 @@

-
+ '; - } + foreach ( (array) $themes as $theme ) { + echo ''; + } wp_nonce_field( 'bulk-themes' ); - if ( 1 == $themes_to_delete ) { - submit_button( __( 'Yes, delete this theme' ), '', 'submit', false ); - } else { - submit_button( __( 'Yes, delete these themes' ), '', 'submit', false ); - } + if ( 1 == $themes_to_delete ) { + submit_button( __( 'Yes, delete this theme' ), '', 'submit', false ); + } else { + submit_button( __( 'Yes, delete these themes' ), '', 'submit', false ); + } ?>
1, - 'action' => 'delete-selected', - 'checked' => $_REQUEST['checked'], - '_wpnonce' => $_REQUEST['_wpnonce'] - ), network_admin_url( 'themes.php' ) ) ) ); + $delete_result = delete_theme( + $theme, + esc_url( + add_query_arg( + array( + 'verify-delete' => 1, + 'action' => 'delete-selected', + 'checked' => $_REQUEST['checked'], + '_wpnonce' => $_REQUEST['_wpnonce'], + ), + network_admin_url( 'themes.php' ) + ) + ) + ); } $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1; - wp_redirect( add_query_arg( array( - 'deleted' => count( $themes ), - 'paged' => $paged, - 's' => $s - ), network_admin_url( 'themes.php' ) ) ); + wp_redirect( + add_query_arg( + array( + 'deleted' => count( $themes ), + 'paged' => $paged, + 's' => $s, + ), + network_admin_url( 'themes.php' ) + ) + ); exit; default: $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array(); @@ -206,7 +222,6 @@ wp_safe_redirect( $referer ); exit; } - } $wp_list_table->prepare_items(); @@ -215,34 +230,38 @@ add_screen_option( 'per_page' ); -get_current_screen()->add_help_tab( array( - 'id' => 'overview', - 'title' => __('Overview'), - 'content' => - '

' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '

' . - '

' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site’s Appearance > Themes screen.') . '

' . - '

' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.') . '

' -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'overview', + 'title' => __( 'Overview' ), + 'content' => + '

' . __( 'This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.' ) . '

' . + '

' . __( 'If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site’s Appearance > Themes screen.' ) . '

' . + '

' . __( 'Themes can be enabled on a site by site basis by the network admin on the Edit Site screen (which has a Themes tab); get there via the Edit action link on the All Sites screen. Only network admins are able to install or edit themes.' ) . '

', + ) +); get_current_screen()->set_help_sidebar( - '

' . __('For more information:') . '

' . - '

' . __('Documentation on Network Themes') . '

' . - '

' . __('Support Forums') . '

' + '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Network Themes' ) . '

' . + '

' . __( 'Support' ) . '

' ); -get_current_screen()->set_screen_reader_content( array( - 'heading_views' => __( 'Filter themes list' ), - 'heading_pagination' => __( 'Themes list navigation' ), - 'heading_list' => __( 'Themes list' ), -) ); +get_current_screen()->set_screen_reader_content( + array( + 'heading_views' => __( 'Filter themes list' ), + 'heading_pagination' => __( 'Themes list navigation' ), + 'heading_list' => __( 'Themes list' ), + ) +); -$title = __('Themes'); +$title = __( 'Themes' ); $parent_file = 'themes.php'; wp_enqueue_script( 'updates' ); wp_enqueue_script( 'theme-preview' ); -require_once(ABSPATH . 'wp-admin/admin-header.php'); +require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?> @@ -302,13 +321,14 @@ views(); -if ( 'broken' == $status ) +if ( 'broken' == $status ) { echo '

' . __( 'The following themes are installed but incomplete.' ) . '

'; +} ?>
- - + + display(); ?>
@@ -320,4 +340,4 @@ wp_print_admin_notice_templates(); wp_print_update_row_templates(); -include(ABSPATH . 'wp-admin/admin-footer.php'); +include( ABSPATH . 'wp-admin/admin-footer.php' );