X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/256a3b381f63716209b3527d0a14442ae570c283..784f914b1e4b1c62d6657e86397c2e83bcee4295:/wp-admin/network/themes.php
diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php
index aada6edb..fbc2aa03 100644
--- a/wp-admin/network/themes.php
+++ b/wp-admin/network/themes.php
@@ -40,14 +40,12 @@ if ( $action ) {
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();
@@ -55,12 +53,11 @@ if ( $action ) {
wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
exit;
}
- foreach( (array) $themes as $theme )
+ foreach ( (array) $themes as $theme )
$allowed_themes[ $theme ] = true;
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();
@@ -68,12 +65,11 @@ if ( $action ) {
wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
exit;
}
- foreach( (array) $themes as $theme )
+ foreach ( (array) $themes as $theme )
unset( $allowed_themes[ $theme ] );
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,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');
@@ -99,32 +95,32 @@ if ( $action ) {
echo '';
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;
}
+ $theme_info = array();
+ foreach ( $themes as $key => $theme ) {
+ $theme_info[ $theme ] = wp_get_theme( $theme );
+ }
+
include(ABSPATH . 'wp-admin/update.php');
$parent_file = 'themes.php';
@@ -132,42 +128,58 @@ 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(
+ /* 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) ) . '';
- ?>
-
-
$_REQUEST['_wpnonce']
), network_admin_url( 'themes.php' ) ) ) );
}
-
+
$paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
wp_redirect( add_query_arg( array(
'deleted' => count( $themes ),
@@ -190,7 +202,6 @@ if ( $action ) {
's' => $s
), network_admin_url( 'themes.php' ) ) );
exit;
- break;
}
}
@@ -198,7 +209,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',
@@ -211,10 +222,16 @@ 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';
@@ -225,30 +242,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.' ) . '
';
}
?>
-
@@ -256,10 +291,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.' ) . '
';
?>
-