--- a/wp/wp-admin/network/themes.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-admin/network/themes.php Tue Jun 09 03:35:32 2015 +0200
@@ -40,14 +40,12 @@
else
wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) );
exit;
- break;
case 'disable':
check_admin_referer('disable-theme_' . $_GET['theme']);
unset( $allowed_themes[ $_GET['theme'] ] );
update_site_option( 'allowedthemes', $allowed_themes );
wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
exit;
- break;
case 'enable-selected':
check_admin_referer('bulk-themes');
$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
@@ -60,7 +58,6 @@
update_site_option( 'allowedthemes', $allowed_themes );
wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
exit;
- break;
case 'disable-selected':
check_admin_referer('bulk-themes');
$themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
@@ -73,7 +70,6 @@
update_site_option( 'allowedthemes', $allowed_themes );
wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
exit;
- break;
case 'update-selected' :
check_admin_referer( 'bulk-themes' );
@@ -90,7 +86,6 @@
require_once(ABSPATH . 'wp-admin/admin-header.php');
echo '<div class="wrap">';
- screen_icon();
echo '<h2>' . esc_html( $title ) . '</h2>';
$url = self_admin_url('update.php?action=update-selected-themes&themes=' . urlencode( join(',', $themes) ));
@@ -100,32 +95,50 @@
echo '</div>';
require_once(ABSPATH . 'wp-admin/admin-footer.php');
exit;
- break;
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';
@@ -133,31 +146,52 @@
if ( ! isset( $_REQUEST['verify-delete'] ) ) {
wp_enqueue_script( 'jquery' );
require_once( ABSPATH . 'wp-admin/admin-header.php' );
+ $themes_to_delete = count( $themes );
?>
<div class="wrap">
- <?php
- $themes_to_delete = count( $themes );
- screen_icon();
- echo '<h2>' . _n( 'Delete Theme', 'Delete Themes', $themes_to_delete ) . '</h2>';
- ?>
- <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo _n( 'This theme may be active on other sites in the network.', 'These themes may be active on other sites in the network.', $themes_to_delete ); ?></p></div>
- <p><?php echo _n( 'You are about to remove the following theme:', 'You are about to remove the following themes:', $themes_to_delete ); ?></p>
+ <?php if ( 1 == $themes_to_delete ) : ?>
+ <h2><?php _e( 'Delete Theme' ); ?></h2>
+ <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'This theme may be active on other sites in the network.' ); ?></p></div>
+ <p><?php _e( 'You are about to remove the following theme:' ); ?></p>
+ <?php else : ?>
+ <h2><?php _e( 'Delete Themes' ); ?></h2>
+ <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php _e( 'These themes may be active on other sites in the network.' ); ?></p></div>
+ <p><?php _e( 'You are about to remove the following themes:' ); ?></p>
+ <?php endif; ?>
<ul class="ul-disc">
- <?php foreach ( $theme_info as $theme )
- echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), $theme->display('Name'), $theme->display('Author') ), '</li>'; /* translators: 1: theme name, 2: theme author */ ?>
+ <?php
+ foreach ( $theme_info as $theme ) {
+ /* translators: 1: theme name, 2: theme author */
+ echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), $theme->display('Name'), $theme->display('Author') ), '</li>';
+ }
+ ?>
</ul>
- <p><?php _e('Are you sure you wish to delete these themes?'); ?></p>
+ <?php if ( 1 == $themes_to_delete ) : ?>
+ <p><?php _e( 'Are you sure you wish to delete this theme?' ); ?></p>
+ <?php else : ?>
+ <p><?php _e( 'Are you sure you wish to delete these themes?' ); ?></p>
+ <?php endif; ?>
<form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
<input type="hidden" name="verify-delete" value="1" />
<input type="hidden" name="action" value="delete-selected" />
<?php
- foreach ( (array) $themes as $theme )
+ foreach ( (array) $themes as $theme ) {
echo '<input type="hidden" name="checked[]" value="' . esc_attr($theme) . '" />';
+ }
+
+ wp_nonce_field( 'bulk-themes' );
+
+ if ( 1 == $themes_to_delete ) {
+ submit_button( __( 'Yes, Delete this theme' ), 'button', 'submit', false );
+ } else {
+ submit_button( __( 'Yes, Delete these themes' ), 'button', 'submit', false );
+ }
?>
- <?php wp_nonce_field('bulk-themes') ?>
- <?php submit_button( _n( 'Yes, Delete this theme', 'Yes, Delete these themes', $themes_to_delete ), 'button', 'submit', false ); ?>
</form>
- <form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
+ <?php
+ $referer = wp_get_referer();
+ ?>
+ <form method="post" action="<?php echo $referer ? esc_url( $referer ) : ''; ?>" style="display:inline;">
<?php submit_button( __( 'No, Return me to the theme list' ), 'button', 'submit', false ); ?>
</form>
@@ -165,8 +199,9 @@
<div id="files-list" style="display:none;">
<ul class="code">
<?php
- foreach ( (array) $files_to_delete as $file )
- echo '<li>' . esc_html( str_replace( WP_CONTENT_DIR . "/themes", '', $file) ) . '</li>';
+ foreach ( (array) $files_to_delete as $file ) {
+ echo '<li>' . esc_html( str_replace( WP_CONTENT_DIR . '/themes', '', $file ) ) . '</li>';
+ }
?>
</ul>
</div>
@@ -184,7 +219,7 @@
'_wpnonce' => $_REQUEST['_wpnonce']
), network_admin_url( 'themes.php' ) ) ) );
}
-
+
$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
wp_redirect( add_query_arg( array(
'deleted' => count( $themes ),
@@ -192,7 +227,6 @@
's' => $s
), network_admin_url( 'themes.php' ) ) );
exit;
- break;
}
}
@@ -200,7 +234,7 @@
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',
@@ -213,21 +247,20 @@
get_current_screen()->set_help_sidebar(
'<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Themes_Screen" target="_blank">Documentation on Network Themes</a>') . '</p>' .
- '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+ '<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Themes_Screen" target="_blank">Documentation on Network Themes</a>') . '</p>' .
+ '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
);
$title = __('Themes');
$parent_file = 'themes.php';
-wp_enqueue_script( 'theme' );
+wp_enqueue_script( 'theme-preview' );
require_once(ABSPATH . 'wp-admin/admin-header.php');
?>
<div class="wrap">
-<?php screen_icon('themes'); ?>
<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
if ( $s )
printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( $s ) ); ?>
@@ -235,23 +268,38 @@
<?php
if ( isset( $_GET['enabled'] ) ) {
- $_GET['enabled'] = absint( $_GET['enabled'] );
- echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>';
+ $enabled = absint( $_GET['enabled'] );
+ if ( 1 == $enabled ) {
+ $message = __( 'Theme enabled.' );
+ } else {
+ $message = _n( '%s theme enabled.', '%s themes enabled.', $enabled );
+ }
+ echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $enabled ) ) . '</p></div>';
} elseif ( isset( $_GET['disabled'] ) ) {
- $_GET['disabled'] = absint( $_GET['disabled'] );
- echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>';
+ $disabled = absint( $_GET['disabled'] );
+ if ( 1 == $disabled ) {
+ $message = __( 'Theme disabled.' );
+ } else {
+ $message = _n( '%s theme disabled.', '%s themes disabled.', $disabled );
+ }
+ echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $disabled ) ) . '</p></div>';
} elseif ( isset( $_GET['deleted'] ) ) {
- $_GET['deleted'] = absint( $_GET['deleted'] );
- echo '<div id="message" class="updated"><p>' . sprintf( _nx( 'Theme deleted.', '%s themes deleted.', $_GET['deleted'], 'network' ), number_format_i18n( $_GET['deleted'] ) ) . '</p></div>';
+ $deleted = absint( $_GET['deleted'] );
+ if ( 1 == $deleted ) {
+ $message = __( 'Theme deleted.' );
+ } else {
+ $message = _n( '%s theme deleted.', '%s themes deleted.', $deleted );
+ }
+ echo '<div id="message" class="updated notice is-dismissible"><p>' . sprintf( $message, number_format_i18n( $deleted ) ) . '</p></div>';
} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
- echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';
+ echo '<div id="message" class="error notice is-dismissible"><p>' . __( 'No theme selected.' ) . '</p></div>';
} elseif ( isset( $_GET['error'] ) && 'main' == $_GET['error'] ) {
- echo '<div class="error"><p>' . __( 'You cannot delete a theme while it is active on the main site.' ) . '</p></div>';
+ echo '<div class="error notice is-dismissible"><p>' . __( 'You cannot delete a theme while it is active on the main site.' ) . '</p></div>';
}
?>
-<form method="get" action="">
+<form method="get">
<?php $wp_list_table->search_box( __( 'Search Installed Themes' ), 'theme' ); ?>
</form>
@@ -262,7 +310,7 @@
echo '<p class="clear">' . __('The following themes are installed but incomplete. Themes must have a stylesheet and a template.') . '</p>';
?>
-<form method="post" action="">
+<form method="post">
<input type="hidden" name="theme_status" value="<?php echo esc_attr($status) ?>" />
<input type="hidden" name="paged" value="<?php echo esc_attr($page) ?>" />