';
$url = self_admin_url('update.php?action=update-selected-themes&themes=' . urlencode( join(',', $themes) ));
$url = wp_nonce_url($url, 'bulk-update-themes');
@@ -96,30 +96,49 @@ if ( $action ) {
require_once(ABSPATH . 'wp-admin/admin-footer.php');
exit;
case 'delete-selected':
- if ( ! current_user_can( 'delete_themes' ) )
+ if ( ! current_user_can( 'delete_themes' ) ) {
wp_die( __('You do not have sufficient permissions to delete themes for this site.') );
+ }
+
check_admin_referer( 'bulk-themes' );
$themes = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked'] : array();
- unset( $themes[ get_option( 'stylesheet' ) ], $themes[ get_option( 'template' ) ] );
-
if ( empty( $themes ) ) {
wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
exit;
}
- $files_to_delete = $theme_info = array();
- foreach ( $themes as $key => $theme ) {
- $theme_info[ $theme ] = wp_get_theme( $theme );
- $files_to_delete = array_merge( $files_to_delete, list_files( $theme_info[ $theme ]->get_stylesheet_directory() ) );
- }
+ $themes = array_diff( $themes, array( get_option( 'stylesheet' ), get_option( 'template' ) ) );
if ( empty( $themes ) ) {
wp_safe_redirect( add_query_arg( 'error', 'main', $referer ) );
exit;
}
+ $files_to_delete = $theme_info = array();
+ $theme_translations = wp_get_installed_translations( 'themes' );
+ foreach ( $themes as $key => $theme ) {
+ $theme_info[ $theme ] = wp_get_theme( $theme );
+
+ // Locate all the files in that folder.
+ $files = list_files( $theme_info[ $theme ]->get_stylesheet_directory() );
+ if ( $files ) {
+ $files_to_delete = array_merge( $files_to_delete, $files );
+ }
+
+ // Add translation files.
+ $theme_slug = $theme_info[ $theme ]->get_stylesheet();
+ if ( ! empty( $theme_translations[ $theme_slug ] ) ) {
+ $translations = $theme_translations[ $theme_slug ];
+
+ foreach ( $translations as $translation => $data ) {
+ $files_to_delete[] = $theme_slug . '-' . $translation . '.po';
+ $files_to_delete[] = $theme_slug . '-' . $translation . '.mo';
+ }
+ }
+ }
+
include(ABSPATH . 'wp-admin/update.php');
$parent_file = 'themes.php';
@@ -127,39 +146,62 @@ if ( $action ) {
if ( ! isset( $_REQUEST['verify-delete'] ) ) {
wp_enqueue_script( 'jquery' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
+ $themes_to_delete = count( $themes );
?>
- ' . _n( 'Delete Theme', 'Delete Themes', $themes_to_delete ) . '';
- ?>
-
-
+
+
+
+
+
+
+
+
+
- ', sprintf( __('%1$s by %2$s' ), $theme->display('Name'), $theme->display('Author') ), ''; /* translators: 1: theme name, 2: theme author */ ?>
+ ', sprintf( __('%1$s by %2$s' ), $theme->display('Name'), $theme->display('Author') ), '';
+ }
+ ?>
-
+
+
+
+
+
-
' . esc_html( str_replace( WP_CONTENT_DIR . "/themes", '', $file) ) . '';
+ foreach ( (array) $files_to_delete as $file ) {
+ echo '- ' . esc_html( str_replace( WP_CONTENT_DIR . '/themes', '', $file ) ) . '
';
+ }
?>
@@ -192,7 +234,7 @@ $wp_list_table->prepare_items();
add_thickbox();
-add_screen_option( 'per_page', array('label' => _x( 'Themes', 'themes per page (screen options)' )) );
+add_screen_option( 'per_page' );
get_current_screen()->add_help_tab( array(
'id' => 'overview',
@@ -205,10 +247,16 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'
' . __('For more information:') . '
' .
- '
' . __('Documentation on Network Themes') . '
' .
+ '
' . __('Documentation on Network Themes') . '
' .
'
' . __('Support Forums') . '
'
);
+get_current_screen()->set_screen_reader_content( array(
+ 'heading_views' => __( 'Filter themes list' ),
+ 'heading_pagination' => __( 'Themes list navigation' ),
+ 'heading_list' => __( 'Themes list' ),
+) );
+
$title = __('Themes');
$parent_file = 'themes.php';
@@ -219,30 +267,45 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
?>
-
' . __('Search results for “%s”') . '', esc_html( $s ) ); ?>
-
+
' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '
';
+ $enabled = absint( $_GET['enabled'] );
+ if ( 1 == $enabled ) {
+ $message = __( 'Theme enabled.' );
+ } else {
+ $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
+ }
+ echo '
' . sprintf( $message, number_format_i18n( $enabled ) ) . '
';
} elseif ( isset( $_GET['disabled'] ) ) {
- $_GET['disabled'] = absint( $_GET['disabled'] );
- echo '
' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '
';
+ $disabled = absint( $_GET['disabled'] );
+ if ( 1 == $disabled ) {
+ $message = __( 'Theme disabled.' );
+ } else {
+ $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+ }
+ echo '
' . sprintf( $message, number_format_i18n( $disabled ) ) . '
';
} elseif ( isset( $_GET['deleted'] ) ) {
- $_GET['deleted'] = absint( $_GET['deleted'] );
- echo '
' . sprintf( _nx( 'Theme deleted.', '%s themes deleted.', $_GET['deleted'], 'network' ), number_format_i18n( $_GET['deleted'] ) ) . '
';
+ $deleted = absint( $_GET['deleted'] );
+ if ( 1 == $deleted ) {
+ $message = __( 'Theme deleted.' );
+ } else {
+ $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
+ }
+ echo '
' . sprintf( $message, number_format_i18n( $deleted ) ) . '
';
} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
- echo '
' . __( 'No theme selected.' ) . '
';
+ echo '
' . __( 'No theme selected.' ) . '
';
} elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) {
- echo '
' . __( 'You cannot delete a theme while it is active on the main site.' ) . '
';
+ echo '
' . __( 'You cannot delete a theme while it is active on the main site.' ) . '
';
}
?>
-
@@ -253,7 +316,7 @@ if ( 'broken' == $status )
echo '
' . __('The following themes are installed but incomplete. Themes must have a stylesheet and a template.') . '
';
?>
-