X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/849f15aeed7a5e39314057bdc0064d8edd60dd7d..HEAD:/wp-admin/network/themes.php
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index e326c93c..baaa6d80 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -10,11 +10,8 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
-if ( ! is_multisite() )
- wp_die( __( 'Multisite support is not enabled.' ) );
-
if ( !current_user_can('manage_network_themes') )
- wp_die( __( 'You do not have sufficient permissions to 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();
@@ -29,12 +26,10 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI']
$referer = remove_query_arg( $temp_args, wp_get_referer() );
if ( $action ) {
- $allowed_themes = get_site_option( 'allowedthemes' );
switch ( $action ) {
case 'enable':
check_admin_referer('enable-theme_' . $_GET['theme']);
- $allowed_themes[ $_GET['theme'] ] = true;
- update_site_option( 'allowedthemes', $allowed_themes );
+ WP_Theme::network_enable_theme( $_GET['theme'] );
if ( false === strpos( $referer, '/network/themes.php' ) )
wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
else
@@ -42,8 +37,7 @@ if ( $action ) {
exit;
case 'disable':
check_admin_referer('disable-theme_' . $_GET['theme']);
- unset( $allowed_themes[ $_GET['theme'] ] );
- update_site_option( 'allowedthemes', $allowed_themes );
+ WP_Theme::network_disable_theme( $_GET['theme'] );
wp_safe_redirect( add_query_arg( 'disabled', '1', $referer ) );
exit;
case 'enable-selected':
@@ -53,9 +47,7 @@ if ( $action ) {
wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
exit;
}
- foreach( (array) $themes as $theme )
- $allowed_themes[ $theme ] = true;
- update_site_option( 'allowedthemes', $allowed_themes );
+ WP_Theme::network_enable_theme( (array) $themes );
wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
exit;
case 'disable-selected':
@@ -65,9 +57,7 @@ if ( $action ) {
wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
exit;
}
- foreach( (array) $themes as $theme )
- unset( $allowed_themes[ $theme ] );
- update_site_option( 'allowedthemes', $allowed_themes );
+ WP_Theme::network_disable_theme( (array) $themes );
wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
exit;
case 'update-selected' :
@@ -86,7 +76,7 @@ if ( $action ) {
require_once(ABSPATH . 'wp-admin/admin-header.php');
echo '
';
- echo '
' . esc_html( $title ) . '
';
+ 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');
@@ -97,7 +87,7 @@ if ( $action ) {
exit;
case 'delete-selected':
if ( ! current_user_can( 'delete_themes' ) ) {
- wp_die( __('You do not have sufficient permissions to delete themes for this site.') );
+ wp_die( __('Sorry, you are not allowed to delete themes for this site.') );
}
check_admin_referer( 'bulk-themes' );
@@ -116,27 +106,9 @@ if ( $action ) {
exit;
}
- $files_to_delete = $theme_info = array();
- $theme_translations = wp_get_installed_translations( 'themes' );
+ $theme_info = array();
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');
@@ -146,23 +118,35 @@ 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') ), '';
+ echo '- ' . sprintf(
+ /* translators: 1: theme name, 2: theme author */
+ _x( '%1$s by %2$s', 'theme' ),
+ '' . $theme->display( 'Name' ) . '',
+ '' . $theme->display( 'Author' ) . ''
+ ) . '
';
}
?>
-
+
+
+
+
+
-
-
-
-
- ' . esc_html( str_replace( WP_CONTENT_DIR . '/themes', '', $file ) ) . '';
+ 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 );
}
?>
-
-
+
+
+
$s
), network_admin_url( 'themes.php' ) ) );
exit;
+ default:
+ $themes = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array();
+ if ( empty( $themes ) ) {
+ wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
+ exit;
+ }
+ check_admin_referer( 'bulk-themes' );
+
+ /** This action is documented in wp-admin/network/site-themes.php */
+ $referer = apply_filters( 'handle_network_bulk_actions-' . get_current_screen()->id, $referer, $action, $themes );
+
+ wp_safe_redirect( $referer );
+ exit;
}
+
}
$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',
@@ -230,13 +226,20 @@ get_current_screen()->add_help_tab( array(
get_current_screen()->set_help_sidebar(
'
' . __('For more information:') . '
' .
- '
' . __('Documentation on Network Themes') . '
' .
- '
' . __('Support Forums') . '
'
+ '
' . __('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';
+wp_enqueue_script( 'updates' );
wp_enqueue_script( 'theme-preview' );
require_once(ABSPATH . 'wp-admin/admin-header.php');
@@ -244,30 +247,48 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');
?>
-
' . __('Search results for “%s”') . '', esc_html( $s ) ); ?>
-
+
' . __( '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.' ) . '
';
}
?>
-
@@ -275,10 +296,10 @@ if ( isset( $_GET['enabled'] ) ) {
$wp_list_table->views();
if ( 'broken' == $status )
- echo '
' . __('The following themes are installed but incomplete. Themes must have a stylesheet and a template.') . '
';
+ echo '
' . __( 'The following themes are installed but incomplete.' ) . '
';
?>
-